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

Qbs: Do not re-parse projects while they are built

Browse Source 
Qbs may update the buildgraph during the build, so this information
may be lost if we reparse at the same time.

Change-Id: Id52e42552736bbe842581cc87d837d0834ad0a2c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-25 13:50:56 +01:00
parent 2e167b4b93
commit bdce2abf1b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -45,6 +45,7 @@
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanagerinterface.h>
#include <projectexplorer/buildenvironmentwidget.h> #include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/buildtargetinfo.h>
#include <projectexplorer/deploymentdata.h> #include <projectexplorer/deploymentdata.h>
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
@@ -382,6 +383,12 @@ void QbsProject::parseCurrentBuildConfiguration(bool force)
if (!m_forceParsing) if (!m_forceParsing)
m_forceParsing = force; m_forceParsing = force;
// Qbs does update the build graph during the build. So we cannot
// start to parse while a build is running or we will lose information.
// Just return since the qbsbuildstep will trigger a reparse after the build.
if (ProjectExplorer::BuildManager::isBuilding(this))
return;
if (!activeTarget()) if (!activeTarget())
return; return;
QbsBuildConfiguration *bc = qobject_cast<QbsBuildConfiguration *>(activeTarget()->activeBuildConfiguration()); QbsBuildConfiguration *bc = qobject_cast<QbsBuildConfiguration *>(activeTarget()->activeBuildConfiguration());