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

ProjectExplore: Introduce dis/enabling of buildconfigurations

Browse Source 
The build actions are disabled if the buildconfiguration is disabled.
The deploy and run actions are disabled if deploying or running invokes
building automatically.

Qt4BuildConfigurations are disabled while parsing.

Task-Nr: QTCREATORBUG-2576
This commit is contained in:
dt
2011-01-19 15:46:01 +01:00
parent 8fdef8e316
commit e505604b92
12 changed files with 134 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -610,6 +610,7 @@ void Qt4Project::update()
if (debug)
qDebug()<<"State is now Base";
m_asyncUpdateState = Base;
activeTarget()->activeBuildConfiguration()->setEnabled(true);
}
void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
@@ -630,6 +631,8 @@ void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
return;
}
activeTarget()->activeBuildConfiguration()->setEnabled(false);
if (m_asyncUpdateState == AsyncFullUpdatePending) {
// Just postpone
if (debug)
@@ -698,6 +701,7 @@ void Qt4Project::scheduleAsyncUpdate()
qDebug()<<" update in progress, canceling and setting state to full update pending";
m_cancelEvaluate = true;
m_asyncUpdateState = AsyncFullUpdatePending;
activeTarget()->activeBuildConfiguration()->setEnabled(false);
m_rootProjectNode->emitProFileInvalidated();
return;
}
@@ -705,6 +709,7 @@ void Qt4Project::scheduleAsyncUpdate()
if (debug)
qDebug()<<" starting timer for full update, setting state to full update pending";
m_partialEvaluate.clear();
activeTarget()->activeBuildConfiguration()->setEnabled(false);
m_rootProjectNode->emitProFileInvalidated();
m_asyncUpdateState = AsyncFullUpdatePending;
m_asyncUpdateTimer.start();
@@ -750,6 +755,7 @@ void Qt4Project::decrementPendingEvaluateFutures()
m_asyncUpdateTimer.start();
} else if (m_asyncUpdateState != ShuttingDown){
// After being done, we need to call:
activeTarget()->activeBuildConfiguration()->setEnabled(true);
foreach (Target *t, targets())
static_cast<Qt4BaseTarget *>(t)->createApplicationProFiles();
updateFileList();