From a2e7d101ef96d66e1de12df11b4e835b7d228e6b Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 23 Jun 2009 11:17:06 +0200
Subject: [PATCH] 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.
---
src/plugins/projectexplorer/projectexplorer.cpp | 5 ++---
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index bf81c1fabdf..a9f130225d7 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -289,8 +289,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mbuild->appendGroup(Constants::G_BUILD_SESSION);
mbuild->appendGroup(Constants::G_BUILD_PROJECT);
mbuild->appendGroup(Constants::G_BUILD_OTHER);
- mbuild->appendGroup(Constants::G_BUILD_RUN);
mbuild->appendGroup(Constants::G_BUILD_CANCEL);
+ mbuild->appendGroup(Constants::G_BUILD_RUN);
msessionContextMenu->appendGroup(Constants::G_SESSION_BUILD);
msessionContextMenu->appendGroup(Constants::G_SESSION_FILES);
@@ -539,10 +539,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
cmd = am->registerAction(m_cleanProjectOnlyAction, Constants::CLEANPROJECTONLY, globalcontext);
// 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);
-
// run action
QIcon runIcon(Constants::ICON_RUN);
runIcon.addFile(Constants::ICON_RUN_SMALL);
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 5e27b68fc8e..3f1d36264dd 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -158,7 +158,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
qmakeIcon.addFile(QLatin1String(":/qt4projectmanager/images/run_qmake_small.png"));
m_runQMakeAction = new QAction(qmakeIcon, tr("Run qmake"), this);
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()));
m_runQMakeActionContextMenu = new QAction(qmakeIcon, tr("Run qmake"), this);
@@ -166,7 +166,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
connect(m_runQMakeActionContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMakeContextMenu()));
-
connect(m_projectExplorer,
SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)),
this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)));
--
GitLab