From 38326a28b72f82b0547a60894fe30257164738e5 Mon Sep 17 00:00:00 2001 From: dt Date: Mon, 28 Mar 2011 15:52:58 +0200 Subject: [PATCH] Modebar Build: Build project with dependencies instead of seesion I do not rememeber why it was building the session and not the active project. Changing it now for 2.2 is too late though. --- src/plugins/projectexplorer/projectexplorer.cpp | 5 +++-- src/plugins/projectexplorer/projectexplorerconstants.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 984af3e1b4e..6fa38e9bf6f 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -629,8 +629,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+B"))); mbuild->addAction(cmd, Constants::G_BUILD_SESSION); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); - // Add to mode bar - modeManager->addAction(cmd->action(), Constants::P_ACTION_BUILDSESSION); // rebuild session action QIcon rebuildIcon(Constants::ICON_REBUILD); @@ -663,6 +661,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+B"))); mbuild->addAction(cmd, Constants::G_BUILD_PROJECT); + // Add to mode bar + modeManager->addAction(cmd->action(), Constants::P_ACTION_BUILDPROJECT); + // rebuild action d->m_rebuildAction = new Utils::ParameterAction(tr("Rebuild Project"), tr("Rebuild Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this); diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 4c87b694a05..8fa3e6e4387 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -100,7 +100,7 @@ const char * const SELECTTARGET = "ProjectExplorer.SelectTarget"; // action priorities const int P_ACTION_RUN = 100; -const int P_ACTION_BUILDSESSION = 80; +const int P_ACTION_BUILDPROJECT = 80; // context const char * const C_PROJECTEXPLORER = "Project Explorer";