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

Qbs: Use base project() in build step when possible

Browse Source 
Change-Id: I8e6a1c9b06273ac77a3c7aa832d5ed4e63e5d475
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-07-26 17:27:36 +02:00
parent 94041d7b44
commit 01e482f96c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -362,8 +362,7 @@ void QbsBuildStep::buildingDone(bool success)
void QbsBuildStep::reparsingDone(bool success) void QbsBuildStep::reparsingDone(bool success)
{ {
disconnect(qbsProject(), &ProjectExplorer::Project::parsingFinished, disconnect(project(), &Project::parsingFinished, this, &QbsBuildStep::reparsingDone);
this, &QbsBuildStep::reparsingDone);
m_parsingProject = false; m_parsingProject = false;
if (m_job) { // This was a scheduled reparsing after building. if (m_job) { // This was a scheduled reparsing after building.
finish(); finish();
@@ -491,8 +490,7 @@ void QbsBuildStep::setCleanInstallRoot(bool clean)
void QbsBuildStep::parseProject() void QbsBuildStep::parseProject()
{ {
m_parsingProject = true; m_parsingProject = true;
connect(qbsProject(), &ProjectExplorer::Project::parsingFinished, connect(project(), &Project::parsingFinished, this, &QbsBuildStep::reparsingDone);
this, &QbsBuildStep::reparsingDone);
qbsProject()->parseCurrentBuildConfiguration(); qbsProject()->parseCurrentBuildConfiguration();
} }