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

QbsProjectManager: Fix missing reparse on session loading

Browse Source 
Task-number: QTCREATORBUG-19572
Change-Id: I71ccdf3abf370fb46dfbfd48a986674b50a04421
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2018-01-09 15:53:17 +01:00
parent 57e27915f4
commit c84ca9bd02
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@ QbsProject::QbsProject(const FileName &fileName) :
connect(this, &Project::removedTarget, connect(this, &Project::removedTarget,
this, [this](Target *t) {m_qbsProjects.remove(t); }); this, [this](Target *t) {m_qbsProjects.remove(t); });
auto delayedParsing = [this]() { auto delayedParsing = [this]() {
if (static_cast<BuildConfiguration *>(sender())->isActive()) if (static_cast<ProjectConfiguration *>(sender())->isActive())
delayParsing(); delayParsing();
}; };
subscribeSignal(&BuildConfiguration::environmentChanged, this, delayedParsing); subscribeSignal(&BuildConfiguration::environmentChanged, this, delayedParsing);
@@ -541,8 +541,11 @@ void QbsProject::handleRuleExecutionDone()
void QbsProject::changeActiveTarget(Target *t) void QbsProject::changeActiveTarget(Target *t)
{ {
if (t) if (t) {
m_qbsProject = m_qbsProjects.value(t); m_qbsProject = m_qbsProjects.value(t);
if (t->isActive())
delayParsing();
}
} }
void QbsProject::startParsing() void QbsProject::startParsing()