diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-13 13:37:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-13 13:37:37 +0100 |
| commit | c7fdb93865c373c2cd75580d57b90d4ec703c42e (patch) | |
| tree | d493895071dd1e99d8d9368bc665ddf1ad4fbb2a /qbs | |
| parent | 89a6611e9e2470afd8e56271d2953a8466c9e625 (diff) | |
| parent | 6ffe04bc40568fe9f79e366e1773458f081944d3 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
Change-Id: I2445882a270731b866b04f28ff87d161224c539a
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" } |