Take qbs.installRoot into account in ProductInstaller.

This is now the default value. Also, fix property look-up in
ProductInstaller; PropertyFinder needs a top-level "modules" key which
the project configuration does not have.

Change-Id: Ibfd7296165a4f3d50b7469fcd1ce957fb89c806c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/corelib/tools/installoptions.cpp b/src/lib/corelib/tools/installoptions.cpp
index cd20a47a3..fe8c3efcb 100644
--- a/src/lib/corelib/tools/installoptions.cpp
+++ b/src/lib/corelib/tools/installoptions.cpp
@@ -59,12 +59,14 @@ QString effectiveInstallRoot(const InstallOptions &options, const TopLevelProjec
     if (!installRoot.isEmpty())
         return installRoot;
 
+    QVariantMap configForPropertyFinder;
+    configForPropertyFinder.insert(QLatin1String("modules"), project->buildConfiguration());
     if (options.installIntoSysroot()) {
-        return PropertyFinder().propertyValue(project->buildConfiguration(),
+        return PropertyFinder().propertyValue(configForPropertyFinder,
             QLatin1String("qbs"), QLatin1String("sysroot")).toString();
     }
-
-    return project->buildDirectory + QLatin1Char('/') + InstallOptions::defaultInstallRoot();
+    return PropertyFinder().propertyValue(configForPropertyFinder,
+        QLatin1String("qbs"), QLatin1String("installRoot")).toString();
 }
 
 } // namespace Internal