feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Use project-global destination dir for libs and plugins

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2018-02-08 16:37:54 +01:00
parent 76c12becad
commit ae20deb3a7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qbs/imports/QtcLibrary.qbs
View File

@@ -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;

2
qbs/imports/QtcPlugin.qbs
View File

@@ -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" }