Bundle Qt libraries on all platforms

This patch allows us to deploy a self-containing Qbs package on all host
platforms that are supported by the official Qt binary packages.
Although not all (Linux) distributions make use of it, this will
be helpful to

- provide at least some binary convenience packages for the most
  important distributions,

- perform building and testing in different environments, for instance
  build Qbs in one stage and then run autotests for desktop, iOS,
  android in parallel on multiple machines,

- avoid windeployqt which does not work when cross-building
  for Windows on a Linux hosts.

Change-Id: I63de4ea2240b37d8bd465cbbf4ddff3d01eeac7e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 5 insertions, 3 deletions

diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs
index 78db72d11..5d4143a41 100644
--- a/qbs-resources/imports/QbsAutotest.qbs
+++ b/qbs-resources/imports/QbsAutotest.qbs
@@ -7,6 +7,7 @@ QtApplication {
     consoleApplication: true
     property string testName
     name: "tst_" + testName
+    property string targetInstallDir: qbsbuildconfig.appInstallDir
     Depends { name: "Qt.testlib" }
     Depends { name: "qbscore" }
     Depends { name: "qbsbuildconfig" }
@@ -28,13 +29,14 @@ QtApplication {
             "consolelogger.h"
         ]
     }
-    cpp.rpaths: [FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix, qbsbuildconfig.libDirName)]
+    cpp.rpaths: qbsbuildconfig.libRPaths
+
     qbs.commonRunEnvironment: ({
         "QBS_INSTALL_DIR": FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix)
     })
     Group {
         fileTagsFilter: product.type
         qbs.install: true
-        qbs.installDir: qbsbuildconfig.appInstallDir
+        qbs.installDir: targetInstallDir
     }
 }
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
index c2db0189f..7fe735ad9 100644
--- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -12,7 +12,7 @@ Module {
     property bool enableProjectFileUpdates: false
     property bool enableRPath: true
     property bool installApiHeaders: true
-    property bool enableBundledQt: true
+    property bool enableBundledQt: false
     property bool useBundledQtScript: false
     property bool staticBuild: false
     property string libDirName: "lib"