From ae20deb3a7286972b4b4f250f9d6a5fd841c8c68 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 8 Feb 2018 16:37:54 +0100
Subject: [PATCH] qbs build: Use project-global destination dir for libs and
 plugins

The autotests' rpath settings expect them there.

Change-Id: I13e3b8fb9a65be16e980b8465ff2e89b9e01ec6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 qbs/imports/QtcLibrary.qbs | 2 +-
 qbs/imports/QtcPlugin.qbs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs
index faa3900a995..8ea8a6d2dff 100644
--- a/qbs/imports/QtcLibrary.qbs
+++ b/qbs/imports/QtcLibrary.qbs
@@ -13,7 +13,7 @@ QtcProduct {
     }
 
     targetName: QtcFunctions.qtLibraryName(qbs, name)
-    destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_library_path)
+    destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_library_path)
 
     cpp.linkerFlags: {
         var flags = base;
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index 95198a62ef4..7606b02504e 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -13,7 +13,7 @@ QtcProduct {
     property var pluginTestDepends: []
 
     targetName: QtcFunctions.qtLibraryName(qbs, name)
-    destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_plugin_path)
+    destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_plugin_path)
 
     Depends { name: "ExtensionSystem" }
     Depends { name: "pluginjson" }