summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-01-09 15:53:17 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-01-11 14:10:50 +0000
commitc84ca9bd027d526afe4cb51b3c3d772f912b6385 (patch)
tree0d4d66ddeacce9b354bc5c22c547cb21fabfc323
parent57e27915f444c95e845b3b2790e2e97fde4c465c (diff)
downloadqt-creator-c84ca9bd027d526afe4cb51b3c3d772f912b6385.tar.gz
QbsProjectManager: Fix missing reparse on session loading
Task-number: QTCREATORBUG-19572 Change-Id: I71ccdf3abf370fb46dfbfd48a986674b50a04421 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/plugins/qbsprojectmanager/qbsproject.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index e87dda87cb..ff7ba2822d 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -142,7 +142,7 @@ QbsProject::QbsProject(const FileName &fileName) :
connect(this, &Project::removedTarget,
this, [this](Target *t) {m_qbsProjects.remove(t); });
auto delayedParsing = [this]() {
- if (static_cast<BuildConfiguration *>(sender())->isActive())
+ if (static_cast<ProjectConfiguration *>(sender())->isActive())
delayParsing();
};
subscribeSignal(&BuildConfiguration::environmentChanged, this, delayedParsing);
@@ -541,8 +541,11 @@ void QbsProject::handleRuleExecutionDone()
void QbsProject::changeActiveTarget(Target *t)
{
- if (t)
+ if (t) {
m_qbsProject = m_qbsProjects.value(t);
+ if (t->isActive())
+ delayParsing();
+ }
}
void QbsProject::startParsing()