Remove support for in-build-dir-execution of the qbs qbs build

This is not supported. People must use the content of the installation
directory instead.

This reduces complexity of qbs' own project files.

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

3 files changed, 7 insertions, 6 deletions

diff --git a/qbs-resources/imports/QbsApp.qbs b/qbs-resources/imports/QbsApp.qbs
index 9d4710219..caec90f85 100644
--- a/qbs-resources/imports/QbsApp.qbs
+++ b/qbs-resources/imports/QbsApp.qbs
@@ -8,7 +8,6 @@ QbsProduct {
     type: ["application", "qbsapplication"]
     version: qbsversion.version
     consoleApplication: true
-    destinationDirectory: FileInfo.joinPaths(project.buildDirectory, "bin")
     cpp.includePaths: [
         "../shared",    // for the logger
     ]
@@ -16,8 +15,8 @@ QbsProduct {
         fileTagsFilter: product.type
             .concat(qbs.buildVariant === "debug" ? ["debuginfo_app"] : [])
         qbs.install: true
-        qbs.installSourceBase: destinationDirectory
         qbs.installDir: targetInstallDir
+        qbs.installSourceBase: buildDirectory
     }
     targetInstallDir: qbsbuildconfig.appInstallDir
     Group {
diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs
index 307bfe836..3dac063f2 100644
--- a/qbs-resources/imports/QbsAutotest.qbs
+++ b/qbs-resources/imports/QbsAutotest.qbs
@@ -18,7 +18,6 @@ QtApplication {
         "../../../src/app/shared", // for the logger
     ]
     cpp.cxxLanguageVersion: "c++14"
-    destinationDirectory: "bin"
     Group {
         name: "logging"
         prefix: FileInfo.joinPaths(product.sourceDirectory, "../../../src/app/shared/logging") + '/'
@@ -33,4 +32,9 @@ QtApplication {
     qbs.commonRunEnvironment: ({
         "QBS_INSTALL_ROOT": qbs.installRoot
     })
+    Group {
+        fileTagsFilter: product.type
+        qbs.install: true
+        qbs.installDir: qbsbuildconfig.appInstallDir
+    }
 }
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs
index 69e107871..bf39cb8d6 100644
--- a/qbs-resources/imports/QbsLibrary.qbs
+++ b/qbs-resources/imports/QbsLibrary.qbs
@@ -7,8 +7,6 @@ QbsProduct {
     version: qbsversion.version
     type: libType
     targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name
-    destinationDirectory: FileInfo.joinPaths(project.buildDirectory,
-        qbs.targetOS.contains("windows") ? "bin" : qbsbuildconfig.libDirName)
     cpp.defines: base.concat(visibilityType === "static" ? ["QBS_STATIC_LIB"] : ["QBS_LIBRARY"])
     cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
     Properties {
@@ -31,8 +29,8 @@ QbsProduct {
         fileTagsFilter: libType.concat("dynamiclibrary_symlink")
             .concat(qbs.buildVariant === "debug" ? ["debuginfo_dll"] : [])
         qbs.install: install
-        qbs.installSourceBase: destinationDirectory
         qbs.installDir: targetInstallDir
+        qbs.installSourceBase: buildDirectory
     }
     targetInstallDir: qbsbuildconfig.libInstallDir
     Group {