diff options
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 209e87b4bc..ca70e12444 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -27,6 +27,7 @@ #include "qbsbuildconfiguration.h" #include "qbsbuildstep.h" +#include "qbsinstallstep.h" #include "qbslogsink.h" #include "qbspmlogging.h" #include "qbsprojectimporter.h" @@ -50,6 +51,7 @@ #include <projectexplorer/buildinfo.h> #include <projectexplorer/buildmanager.h> #include <projectexplorer/buildtargetinfo.h> +#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deploymentdata.h> #include <projectexplorer/kit.h> #include <projectexplorer/kitinformation.h> @@ -488,6 +490,14 @@ FilePath QbsProject::installRoot() { if (!activeTarget()) return FilePath(); + const auto dc = activeTarget()->activeDeployConfiguration(); + if (dc) { + const QList<QbsInstallStep *> qbsInstallSteps = dc->stepList()->allOfType<QbsInstallStep>(); + for (QbsInstallStep * const step : qbsInstallSteps) { + if (step->enabled()) + return FilePath::fromString(step->installRoot()); + } + } const auto * const bc = qobject_cast<QbsBuildConfiguration *>(activeTarget()->activeBuildConfiguration()); if (!bc) |