diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-08 11:03:51 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-12 10:08:22 +0000 |
| commit | 3c75d3aec1a4e4f811a001a5ef3fa07f9cc0caab (patch) | |
| tree | 8651957688a034f377ae761d68d9d189b95c9e5b /qbs | |
| parent | 7a2e1e29cb38b339780938a3e582110e566b5631 (diff) | |
qbs build: Install debug info alongside binaries
... if separate debug info is enabled.
Change-Id: I15a02b11e7df18719074b9bc503fe2c207f8bf00
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcLibrary.qbs | 5 | ||||
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 4 | ||||
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 2 | ||||
| -rw-r--r-- | qbs/imports/QtcTool.qbs | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index af6eb04bad..faa3900a99 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -1,10 +1,11 @@ import qbs 1.0 +import qbs.FileInfo import QtcFunctions QtcProduct { type: ["dynamiclibrary", "dynamiclibrary_symlink", "qtc.dev-module"] installDir: qtc.ide_library_path - installTags: ["dynamiclibrary", "dynamiclibrary_symlink"] + installTags: ["dynamiclibrary", "dynamiclibrary_symlink", "debuginfo_dll"] useNonGuiPchFile: true Depends { condition: qtc.testsEnabled @@ -12,7 +13,7 @@ QtcProduct { } targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: qtc.ide_library_path + destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_library_path) cpp.linkerFlags: { var flags = base; diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 25d7bcaa76..95198a62ef 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -5,7 +5,7 @@ import QtcFunctions QtcProduct { type: ["dynamiclibrary", "pluginSpec", "qtc.dev-module"] installDir: qtc.ide_plugin_path - installTags: ["dynamiclibrary"] + installTags: ["dynamiclibrary", "debuginfo_dll"] useGuiPchFile: true property var pluginJsonReplacements @@ -13,7 +13,7 @@ QtcProduct { property var pluginTestDepends: [] targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: qtc.ide_plugin_path + destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_plugin_path) Depends { name: "ExtensionSystem" } Depends { name: "pluginjson" } diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index f7b5398126..ef19ce4987 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -8,7 +8,7 @@ Product { version: qtc.qtcreator_version property bool install: true property string installDir - property string installSourceBase + property string installSourceBase: destinationDirectory property stringList installTags: type property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs" property bool useNonGuiPchFile: false diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index 304e2e87a9..1b38968650 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -5,6 +5,7 @@ QtcProduct { type: ["application"] consoleApplication: true installDir: qtc.ide_libexec_path + installTags: base.concat(["debuginfo_app"]) useNonGuiPchFile: true cpp.rpaths: { |