Generators: pass down full InstallOptions instead of just install root

This is needed for a followup patch to add environment handling.

Change-Id: Id492226c4b51646a97f7c2de1bb7e91dab512d32
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

3 files changed, 7 insertions, 5 deletions

diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp
index e167d7820..4f422ed0e 100644
--- a/src/lib/corelib/generators/generator.cpp
+++ b/src/lib/corelib/generators/generator.cpp
@@ -211,7 +211,7 @@ const GeneratableProject ProjectGenerator::project() const
     proj.data = p.data;
     proj.products = p.products;
     proj.subProjects = p.subProjects;
-    proj.installRoot = d->installOptions.installRoot();
+    proj.installOptions = d->installOptions;
     return proj;
 }
 
diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h
index b60e84b0e..369e70f06 100644
--- a/src/lib/corelib/generators/generatordata.h
+++ b/src/lib/corelib/generators/generatordata.h
@@ -44,6 +44,7 @@
 #include <QMap>
 #include <api/project.h>
 #include <api/projectdata.h>
+#include <tools/installoptions.h>
 
 namespace qbs {
 
@@ -68,7 +69,7 @@ struct GeneratableProject : public GeneratableProjectData {
     GeneratableProjectMap projects;
     QMap<QString, QVariantMap> buildConfigurations;
     QMap<QString, QStringList> commandLines;
-    QString installRoot;
+    InstallOptions installOptions;
     QDir baseBuildDirectory() const;
     QFileInfo filePath() const;
     bool hasMultipleConfigurations() const;
diff --git a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
index cbf0d430d..6c47007b2 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
@@ -72,7 +72,8 @@ QString qbsCommandLine(const GeneratableProject &project,
         commandLine.appendArgument(QStringLiteral("--wait-lock"));
     }
 
-    if (realSubCommand == QStringLiteral("build") && !project.installRoot.isEmpty()) {
+    if (realSubCommand == QStringLiteral("build")
+            && !project.installOptions.installRoot().isEmpty()) {
         commandLine.appendArgument(QStringLiteral("--install-root"));
         addEnvironmentVariableArgument(commandLine, QStringLiteral("QbsInstallRoot"));
     }
@@ -101,10 +102,10 @@ MSBuildSharedSolutionPropertiesProject::MSBuildSharedSolutionPropertiesProject(
     // Order's important here... a variable must be listed before one that uses it
     group->appendProperty(QStringLiteral("QbsExecutablePath"),
                           QStringLiteral("$(QbsExecutableDir)") + qbsExecutable.fileName());
-    if (!project.installRoot.isEmpty()) {
+    if (!project.installOptions.installRoot().isEmpty()) {
         group->appendProperty(QStringLiteral("QbsInstallRoot"),
                               Internal::PathUtils::toNativeSeparators(
-                                  project.installRoot,
+                                  project.installOptions.installRoot(),
                                   Internal::HostOsInfo::HostOsWindows));
     }