diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2012-05-13 21:54:37 +0300 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-05-18 11:52:50 +0200 |
| commit | 32b5bd2778becc30042c9b1e37688410433e982e (patch) | |
| tree | 5da1b69c8fc39ee3e03ef0da8f51fd9154448a2b /src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp | |
| parent | 615f35f1440d932b5e86e832ffaa3eb1c226b037 (diff) | |
| download | qt-creator-32b5bd2778becc30042c9b1e37688410433e982e.tar.gz | |
Qt4PM: Re-enable context "Run qmake" for root project node
Change-Id: I4e4abf8dfc7997d3fdf4525fc97ff277f112b7d9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index 245e87eedf..2be33f87d2 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -390,7 +390,8 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node, Qt4BuildConfiguration *buildConfiguration = (qt4Project && qt4Project->activeTarget()) ? qt4Project->activeTarget()->activeQt4BuildConfiguration() : 0; bool isProjectNode = qt4Project && proFileNode && buildConfiguration; - bool enabled = subProjectActionsVisible && !m_projectExplorer->buildManager()->isBuilding(project); + bool isBuilding = m_projectExplorer->buildManager()->isBuilding(project); + bool enabled = subProjectActionsVisible && !isBuilding; m_buildSubProjectAction->setVisible(subProjectActionsVisible); m_rebuildSubProjectAction->setVisible(subProjectActionsVisible); @@ -399,8 +400,7 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node, m_subProjectRebuildSeparator->setVisible(subProjectActionsVisible && isProjectNode); m_rebuildSubProjectContextMenu->setVisible(subProjectActionsVisible && isProjectNode); m_cleanSubProjectContextMenu->setVisible(subProjectActionsVisible && isProjectNode); - m_runQMakeActionContextMenu->setVisible(subProjectActionsVisible && isProjectNode - && buildConfiguration->qmakeStep()); + m_runQMakeActionContextMenu->setVisible(isProjectNode && buildConfiguration->qmakeStep()); m_buildFileAction->setVisible(buildFilePossible); m_buildSubProjectAction->setEnabled(enabled); @@ -409,7 +409,8 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node, m_buildSubProjectContextMenu->setEnabled(enabled && isProjectNode); m_rebuildSubProjectContextMenu->setEnabled(enabled && isProjectNode); m_cleanSubProjectContextMenu->setEnabled(enabled && isProjectNode); - m_runQMakeActionContextMenu->setEnabled(enabled && isProjectNode && buildConfiguration->qmakeStep()); + m_runQMakeActionContextMenu->setEnabled(isProjectNode && !isBuilding + && buildConfiguration->qmakeStep()); } void Qt4ProjectManagerPlugin::buildStateChanged(ProjectExplorer::Project *pro) |