feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Fix build

Browse Source 
BuildStepList: :allOfType() was newly used in 4.10 and removed in 4.11.
Change-Id: I3129f4a8aa411547e018c88eec02df58f56285f9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-10-16 17:44:15 +02:00
parent d56df8da18
commit f5e25c50db
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -468,10 +468,12 @@ FilePath QbsProject::installRoot()
return FilePath(); return FilePath();
const auto dc = activeTarget()->activeDeployConfiguration(); const auto dc = activeTarget()->activeDeployConfiguration();
if (dc) { if (dc) {
const QList<QbsInstallStep *> qbsInstallSteps = dc->stepList()->allOfType<QbsInstallStep>(); const QList<BuildStep *> steps = dc->stepList()->steps();
for (QbsInstallStep * const step : qbsInstallSteps) { for (const BuildStep * const step : steps) {
if (step->enabled()) if (!step->enabled())
return FilePath::fromString(step->installRoot()); continue;
if (const auto qbsInstallStep = qobject_cast<const QbsInstallStep *>(step))
return FilePath::fromString(qbsInstallStep->installRoot());
} }
} }
const auto * const bc const auto * const bc