Commit dd1a77ae authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Qbs: Fix some more issues introduced by the subprojects support



Change-Id: I6edf9147f579c115394695d7f995f38448610284
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 1ce18ccb
...@@ -163,7 +163,7 @@ QStringList QbsProject::files(ProjectExplorer::Project::FilesMode fileMode) cons ...@@ -163,7 +163,7 @@ QStringList QbsProject::files(ProjectExplorer::Project::FilesMode fileMode) cons
Q_UNUSED(fileMode); Q_UNUSED(fileMode);
QSet<QString> result; QSet<QString> result;
if (m_rootProjectNode && m_rootProjectNode->qbsProjectData()) { 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 qbs::GroupData &grp, prd.groups()) {
foreach (const QString &file, grp.allFilePaths()) foreach (const QString &file, grp.allFilePaths())
result.insert(file); result.insert(file);
...@@ -191,7 +191,7 @@ qbs::BuildJob *QbsProject::build(const qbs::BuildOptions &opts, QStringList prod ...@@ -191,7 +191,7 @@ qbs::BuildJob *QbsProject::build(const qbs::BuildOptions &opts, QStringList prod
QList<qbs::ProductData> products; QList<qbs::ProductData> products;
foreach (const QString &productName, productNames) { foreach (const QString &productName, productNames) {
bool found = false; bool found = false;
foreach (const qbs::ProductData &data, qbsProjectData()->products()) { foreach (const qbs::ProductData &data, qbsProjectData()->allProducts()) {
if (data.name() == productName) { if (data.name() == productName) {
found = true; found = true;
products.append(data); products.append(data);
...@@ -525,7 +525,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj) ...@@ -525,7 +525,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj)
} }
QStringList allFiles; QStringList allFiles;
foreach (const qbs::ProductData &prd, prj->products()) { foreach (const qbs::ProductData &prd, prj->allProducts()) {
foreach (const qbs::GroupData &grp, prd.groups()) { foreach (const qbs::GroupData &grp, prd.groups()) {
const qbs::PropertyMap &props = grp.properties(); const qbs::PropertyMap &props = grp.properties();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment