Don't install into sysroot by default.

Task-number: QBS-249

Change-Id: I8c4dd985873afd48f65dbc1e368a52b4acadc9c2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/lib/buildgraph/productinstaller.cpp b/src/lib/buildgraph/productinstaller.cpp
index 70031716b..83e2b3d3a 100644
--- a/src/lib/buildgraph/productinstaller.cpp
+++ b/src/lib/buildgraph/productinstaller.cpp
@@ -65,13 +65,14 @@ ProductInstaller::ProductInstaller(const QList<ResolvedProductPtr> &products,
         throw Error(Tr::tr("Cannot deduce install root, because there are no products."));
 
     const ResolvedProductConstPtr &product = m_products.first();
-    m_options.setInstallRoot(product->properties
-                             ->qbsPropertyValue(QLatin1String("sysroot")).toString());
-    if (m_options.installRoot().isEmpty()) {
+    if (m_options.installIntoSysroot()) {
+        if (m_options.removeExistingInstallation())
+            throw Error(Tr::tr("Refusing to remove sysroot."));
+        m_options.setInstallRoot(product->properties
+                                 ->qbsPropertyValue(QLatin1String("sysroot")).toString());
+    } else {
         m_options.setInstallRoot(product->project->buildDirectory
-                + QLatin1Char('/') + InstallOptions::defaultInstallRoot());
-    } else if (m_options.removeExistingInstallation()) {
-        throw Error(Tr::tr("Refusing to remove sysroot."));
+            + QLatin1Char('/') + InstallOptions::defaultInstallRoot());
     }
 }