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

Qt4PM: Re-enable context "Run qmake" for root project node

Browse Source 
Change-Id: I4e4abf8dfc7997d3fdf4525fc97ff277f112b7d9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-05-13 21:54:37 +03:00
committed by Daniel Teske
parent 615f35f144
commit 32b5bd2778
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
View File

@@ -390,7 +390,8 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node,
Qt4BuildConfiguration *buildConfiguration = (qt4Project && qt4Project->activeTarget()) ? Qt4BuildConfiguration *buildConfiguration = (qt4Project && qt4Project->activeTarget()) ?
qt4Project->activeTarget()->activeQt4BuildConfiguration() : 0; qt4Project->activeTarget()->activeQt4BuildConfiguration() : 0;
bool isProjectNode = qt4Project && proFileNode && buildConfiguration; 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_buildSubProjectAction->setVisible(subProjectActionsVisible);
m_rebuildSubProjectAction->setVisible(subProjectActionsVisible); m_rebuildSubProjectAction->setVisible(subProjectActionsVisible);
@@ -399,8 +400,7 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node,
m_subProjectRebuildSeparator->setVisible(subProjectActionsVisible && isProjectNode); m_subProjectRebuildSeparator->setVisible(subProjectActionsVisible && isProjectNode);
m_rebuildSubProjectContextMenu->setVisible(subProjectActionsVisible && isProjectNode); m_rebuildSubProjectContextMenu->setVisible(subProjectActionsVisible && isProjectNode);
m_cleanSubProjectContextMenu->setVisible(subProjectActionsVisible && isProjectNode); m_cleanSubProjectContextMenu->setVisible(subProjectActionsVisible && isProjectNode);
m_runQMakeActionContextMenu->setVisible(subProjectActionsVisible && isProjectNode m_runQMakeActionContextMenu->setVisible(isProjectNode && buildConfiguration->qmakeStep());
&& buildConfiguration->qmakeStep());
m_buildFileAction->setVisible(buildFilePossible); m_buildFileAction->setVisible(buildFilePossible);
m_buildSubProjectAction->setEnabled(enabled); m_buildSubProjectAction->setEnabled(enabled);
@@ -409,7 +409,8 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node,
m_buildSubProjectContextMenu->setEnabled(enabled && isProjectNode); m_buildSubProjectContextMenu->setEnabled(enabled && isProjectNode);
m_rebuildSubProjectContextMenu->setEnabled(enabled && isProjectNode); m_rebuildSubProjectContextMenu->setEnabled(enabled && isProjectNode);
m_cleanSubProjectContextMenu->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) void Qt4ProjectManagerPlugin::buildStateChanged(ProjectExplorer::Project *pro)