Commit a2e7d101 authored by dt's avatar dt
Browse files

Some further reodering in the build menu.

Details: I want to have a way to run individual build steps stand alone.
This is partly in preparation for that.
parent eef9f27b
...@@ -289,8 +289,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ...@@ -289,8 +289,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mbuild->appendGroup(Constants::G_BUILD_SESSION); mbuild->appendGroup(Constants::G_BUILD_SESSION);
mbuild->appendGroup(Constants::G_BUILD_PROJECT); mbuild->appendGroup(Constants::G_BUILD_PROJECT);
mbuild->appendGroup(Constants::G_BUILD_OTHER); mbuild->appendGroup(Constants::G_BUILD_OTHER);
mbuild->appendGroup(Constants::G_BUILD_RUN);
mbuild->appendGroup(Constants::G_BUILD_CANCEL); mbuild->appendGroup(Constants::G_BUILD_CANCEL);
mbuild->appendGroup(Constants::G_BUILD_RUN);
msessionContextMenu->appendGroup(Constants::G_SESSION_BUILD); msessionContextMenu->appendGroup(Constants::G_SESSION_BUILD);
msessionContextMenu->appendGroup(Constants::G_SESSION_FILES); msessionContextMenu->appendGroup(Constants::G_SESSION_FILES);
...@@ -539,10 +539,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ...@@ -539,10 +539,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
cmd = am->registerAction(m_cleanProjectOnlyAction, Constants::CLEANPROJECTONLY, globalcontext); cmd = am->registerAction(m_cleanProjectOnlyAction, Constants::CLEANPROJECTONLY, globalcontext);
// Add Set Build Configuration to menu // Add Set Build Configuration to menu
mbuild->addMenu(mbc, Constants::G_BUILD_PROJECT); mbuild->addMenu(mbc, Constants::G_BUILD_OTHER);
mproject->addMenu(mbc, Constants::G_PROJECT_CONFIG); mproject->addMenu(mbc, Constants::G_PROJECT_CONFIG);
// run action // run action
QIcon runIcon(Constants::ICON_RUN); QIcon runIcon(Constants::ICON_RUN);
runIcon.addFile(Constants::ICON_RUN_SMALL); runIcon.addFile(Constants::ICON_RUN_SMALL);
......
...@@ -158,7 +158,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString * ...@@ -158,7 +158,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
qmakeIcon.addFile(QLatin1String(":/qt4projectmanager/images/run_qmake_small.png")); qmakeIcon.addFile(QLatin1String(":/qt4projectmanager/images/run_qmake_small.png"));
m_runQMakeAction = new QAction(qmakeIcon, tr("Run qmake"), this); m_runQMakeAction = new QAction(qmakeIcon, tr("Run qmake"), this);
command = am->registerAction(m_runQMakeAction, Constants::RUNQMAKE, context); command = am->registerAction(m_runQMakeAction, Constants::RUNQMAKE, context);
mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_RUN); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_PROJECT);
connect(m_runQMakeAction, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMake())); connect(m_runQMakeAction, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMake()));
m_runQMakeActionContextMenu = new QAction(qmakeIcon, tr("Run qmake"), this); m_runQMakeActionContextMenu = new QAction(qmakeIcon, tr("Run qmake"), this);
...@@ -166,7 +166,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString * ...@@ -166,7 +166,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD); mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
connect(m_runQMakeActionContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMakeContextMenu())); connect(m_runQMakeActionContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMakeContextMenu()));
connect(m_projectExplorer, connect(m_projectExplorer,
SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)), SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)),
this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*))); this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment