diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-08 16:37:54 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-12 15:34:18 +0000 |
| commit | ae20deb3a7286972b4b4f250f9d6a5fd841c8c68 (patch) | |
| tree | c50e69da7688bdc0840a3842c38c5c7cd17ca20f /qbs | |
| parent | 76c12becad1bb32fe34521e629df5fd87462121e (diff) | |
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>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcLibrary.qbs | 2 | ||||
| -rw-r--r-- | 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 faa3900a99..8ea8a6d2df 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 95198a62ef..7606b02504 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" } |