From 96fa09bb4f9dd709c730dc4a59565ff8f17c2d9e Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 2 Feb 2016 12:44:42 +0100 Subject: [PATCH] Qmake: Set a rootProjectNode early. This one covers the time between a QmakeProject being constructed and has its settings read or is being parsed. Change-Id: I64d6a9d39b1e188d2af10c58135ab9174af8d701 Reviewed-by: Christian Stenger Reviewed-by: Orgad Shaneh --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 297454831b8..413fd4b94c4 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -307,6 +307,8 @@ QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) : m_asyncUpdateTimer.setInterval(3000); connect(&m_asyncUpdateTimer, &QTimer::timeout, this, &QmakeProject::asyncUpdate); + setRootProjectNode(new QmakeProFileNode(this, projectFilePath())); + connect(BuildManager::instance(), &BuildManager::buildQueueFinished, this, &QmakeProject::buildFinished); @@ -356,8 +358,6 @@ Project::RestoreResult QmakeProject::fromMap(const QVariantMap &map, QString *er projectManager()->registerProject(this); - setRootProjectNode(new QmakeProFileNode(this, projectFilePath())); - // On active buildconfiguration changes, reevaluate the .pro files m_activeTarget = activeTarget(); if (m_activeTarget) {