From 4cfaeb8b519334370ed769d0a578cc4e5ef4d340 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Fri, 12 Sep 2014 17:38:12 +0200
Subject: QbsProjectManager: Fix crash when calling QbsProject::files().

We can't do that during parsing, as qbs::Project::buildSystemFiles()
might run into a race condition.

Change-Id: Iae3fd3000fdc71fec50c82d50fb3b4e3888351bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/plugins/qbsprojectmanager/qbsproject.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index e115649868..a973cf585b 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -190,11 +190,11 @@ static void collectFilesForProject(const qbs::ProjectData &project, QSet<QString
 QStringList QbsProject::files(Project::FilesMode fileMode) const
 {
     Q_UNUSED(fileMode);
-    if (!m_rootProjectNode || !m_rootProjectNode->qbsProjectData().isValid())
+    if (!m_qbsProject.isValid() || isParsing())
         return QStringList();
     QSet<QString> result;
-    collectFilesForProject(m_rootProjectNode->qbsProjectData(), result);
-    result.unite(qbsProject().buildSystemFiles());
+    collectFilesForProject(m_projectData, result);
+    result.unite(m_qbsProject.buildSystemFiles());
     return result.toList();
 }
 
-- 
cgit v1.2.1