diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
| commit | 914adeab82d228773def64c9c304d1e15bab0b52 (patch) | |
| tree | 9ab0f8e7b09d62b77ffc5450d9e883a89d69fd88 /src/plugins/qbsprojectmanager/qbsproject.cpp | |
| parent | 11f89ece8de7763f811d2fe1e45cb27ad4a77519 (diff) | |
| parent | a4db6db358aefb60bac34cacbab23aa6f38279f7 (diff) | |
| download | qt-creator-914adeab82d228773def64c9c304d1e15bab0b52.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsproject.cpp')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 020a50fd95..ff7cadbe45 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(); } |