feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Revert "Modebar Build: Build project with dependencies instead of seesion""

Browse Source 
This reverts commit 7111b4e83d.
This commit is contained in:
dt
2011-03-29 19:19:19 +02:00
parent 66f70b105d
commit 44e8a06c0e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -629,8 +629,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+B"))); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+B")));
mbuild->addAction(cmd, Constants::G_BUILD_SESSION); mbuild->addAction(cmd, Constants::G_BUILD_SESSION);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD);
// Add to mode bar
modeManager->addAction(cmd->action(), Constants::P_ACTION_BUILDSESSION);
// rebuild session action // rebuild session action
QIcon rebuildIcon(Constants::ICON_REBUILD); QIcon rebuildIcon(Constants::ICON_REBUILD);
@@ -663,6 +661,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+B"))); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+B")));
mbuild->addAction(cmd, Constants::G_BUILD_PROJECT); mbuild->addAction(cmd, Constants::G_BUILD_PROJECT);
// Add to mode bar
modeManager->addAction(cmd->action(), Constants::P_ACTION_BUILDPROJECT);
// rebuild action // rebuild action
d->m_rebuildAction = new Utils::ParameterAction(tr("Rebuild Project"), tr("Rebuild Project \"%1\""), d->m_rebuildAction = new Utils::ParameterAction(tr("Rebuild Project"), tr("Rebuild Project \"%1\""),
Utils::ParameterAction::AlwaysEnabled, this); Utils::ParameterAction::AlwaysEnabled, this);

2
src/plugins/projectexplorer/projectexplorerconstants.h
View File

@@ -100,7 +100,7 @@ const char * const SELECTTARGET = "ProjectExplorer.SelectTarget";
// action priorities // action priorities
const int P_ACTION_RUN = 100; const int P_ACTION_RUN = 100;
const int P_ACTION_BUILDSESSION = 80; const int P_ACTION_BUILDPROJECT = 80;
// context // context
const char * const C_PROJECTEXPLORER = "Project Explorer"; const char * const C_PROJECTEXPLORER = "Project Explorer";