3 files changed, 6 insertions, 3 deletions
diff --git a/qbs-resources/imports/QbsApp.qbs b/qbs-resources/imports/QbsApp.qbs
index a81efca6a..8e671764d 100644
--- a/qbs-resources/imports/QbsApp.qbs
+++ b/qbs-resources/imports/QbsApp.qbs
@@ -17,9 +17,10 @@ QbsProduct {
         fileTagsFilter: product.type
             .concat(qbs.buildVariant === "debug" ? ["debuginfo_app"] : [])
         qbs.install: true
-        qbs.installDir: qbsbuildconfig.appInstallDir
         qbs.installSourceBase: destinationDirectory
+        qbs.installDir: targetInstallDir
     }
+    targetInstallDir: qbsbuildconfig.appInstallDir
     Group {
         name: "logging"
         prefix: FileInfo.joinPaths(product.sourceDirectory, "../shared/logging") + '/'
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs
index 8757b790c..a6bc7366d 100644
--- a/qbs-resources/imports/QbsLibrary.qbs
+++ b/qbs-resources/imports/QbsLibrary.qbs
@@ -22,9 +22,10 @@ QbsProduct {
         fileTagsFilter: product.type.concat("dynamiclibrary_symlink")
             .concat(qbs.buildVariant === "debug" ? ["debuginfo_dll"] : [])
         qbs.install: install
-        qbs.installDir: qbsbuildconfig.libInstallDir
         qbs.installSourceBase: destinationDirectory
+        qbs.installDir: targetInstallDir
     }
+    targetInstallDir: qbsbuildconfig.libInstallDir
     Group {
         fileTagsFilter: ["dynamiclibrary_import"]
         qbs.install: install
@@ -42,7 +43,6 @@ QbsProduct {
         Depends { name: "Qt"; submodules: ["core"] }
         Depends { name: "qbsbuildconfig" }
 
-        cpp.rpaths: qbsbuildconfig.libRPaths
         cpp.includePaths: [product.sourceDirectory]
         cpp.defines: product.visibilityType === "static" ? ["QBS_STATIC_LIB"] : []
     }
diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs
index a90037bc6..ff5915d00 100644
--- a/qbs-resources/imports/QbsProduct.qbs
+++ b/qbs-resources/imports/QbsProduct.qbs
@@ -6,6 +6,7 @@ Product {
     Depends { name: "Qt.core"; versionAtLeast: minimumQtVersion }
     property string minimumQtVersion: "5.6.0"
     property bool install: true
+    property string targetInstallDir
     cpp.defines: {
         var res = ["QT_NO_CAST_FROM_ASCII", "QT_NO_PROCESS_COMBINED_ARGUMENT_START"];
         if (qbs.toolchain.contains("msvc"))
@@ -15,4 +16,5 @@ Product {
         return res;
     }
     cpp.enableExceptions: true
+    cpp.rpaths: qbsbuildconfig.libRPaths
 }