From dd1a77aef9311ee8bbcebaa458ff7a841462ac0c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Fri, 21 Jun 2013 15:09:01 +0200
Subject: [PATCH] Qbs: Fix some more issues introduced by the subprojects
support
Change-Id: I6edf9147f579c115394695d7f995f38448610284
Reviewed-by: Tobias Hunger <tobias.hunger@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 643e721898..89c414976c 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -163,7 +163,7 @@ QStringList QbsProject::files(ProjectExplorer::Project::FilesMode fileMode) cons
Q_UNUSED(fileMode);
QSet<QString> result;
if (m_rootProjectNode && m_rootProjectNode->qbsProjectData()) {
- foreach (const qbs::ProductData &prd, m_rootProjectNode->qbsProjectData()->products()) {
+ foreach (const qbs::ProductData &prd, m_rootProjectNode->qbsProjectData()->allProducts()) {
foreach (const qbs::GroupData &grp, prd.groups()) {
foreach (const QString &file, grp.allFilePaths())
result.insert(file);
@@ -191,7 +191,7 @@ qbs::BuildJob *QbsProject::build(const qbs::BuildOptions &opts, QStringList prod
QList<qbs::ProductData> products;
foreach (const QString &productName, productNames) {
bool found = false;
- foreach (const qbs::ProductData &data, qbsProjectData()->products()) {
+ foreach (const qbs::ProductData &data, qbsProjectData()->allProducts()) {
if (data.name() == productName) {
found = true;
products.append(data);
@@ -525,7 +525,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj)
}
QStringList allFiles;
- foreach (const qbs::ProductData &prd, prj->products()) {
+ foreach (const qbs::ProductData &prd, prj->allProducts()) {
foreach (const qbs::GroupData &grp, prd.groups()) {
const qbs::PropertyMap &props = grp.properties();
--
GitLab