Commit eec42b23 authored by Tobias Hunger's avatar Tobias Hunger

Qbs: Fix QbsRunConfiguration creation with subprojects

Change-Id: I55528aba6c5d88c2466142248557580456015d2d
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 9368a82e
...@@ -76,7 +76,7 @@ const qbs::ProductData *findProduct(const qbs::ProjectData *pro, const QString & ...@@ -76,7 +76,7 @@ const qbs::ProductData *findProduct(const qbs::ProjectData *pro, const QString &
if (!pro) if (!pro)
return 0; return 0;
foreach (const qbs::ProductData &product, pro->products()) { foreach (const qbs::ProductData &product, pro->allProducts()) {
if (product.name() == name) if (product.name() == name)
return &product; return &product;
} }
...@@ -565,7 +565,7 @@ QList<Core::Id> QbsRunConfigurationFactory::availableCreationIds(ProjectExplorer ...@@ -565,7 +565,7 @@ QList<Core::Id> QbsRunConfigurationFactory::availableCreationIds(ProjectExplorer
if (!project || !project->qbsProjectData() || !project->qbsProject()) if (!project || !project->qbsProjectData() || !project->qbsProject())
return result; return result;
foreach (const qbs::ProductData &product, project->qbsProjectData()->products()) { foreach (const qbs::ProductData &product, project->qbsProjectData()->allProducts()) {
if (!project->qbsProject()->targetExecutable(product, qbs::InstallOptions()).isEmpty()) if (!project->qbsProject()->targetExecutable(product, qbs::InstallOptions()).isEmpty())
result << Core::Id::fromString(QString::fromLatin1(QBS_RC_PREFIX) + product.name()); result << Core::Id::fromString(QString::fromLatin1(QBS_RC_PREFIX) + product.name());
} }
......
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