diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-03-17 20:13:36 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-03-20 17:47:29 +0000 |
| commit | ee0b4e1fed81e63685f4b6deb30e4893b9193820 (patch) | |
| tree | de64366c0ae7d0badb3c57bf91ce11ff5a15c71b /share | |
| parent | 211ff09d350855d467a27b52f8a62930c1477996 (diff) | |
Convenience items can now install separated debug info
This patchset adds the 'installDebugInformation' and
'debugInformationInstallDir' properties to the NativeBinary item and
adds Group items that install debug info to the Library and Application
items.
Also, update How-To about installing debug symbols
More documentation (for the Library and the NativeBinary items) will be
added in a separate patchset
Change-Id: I32687b99871fe40a8e26db09aa118a89ae73f922
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/base/Application.qbs | 8 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/base/Library.qbs | 14 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/base/NativeBinary.qbs | 3 |
3 files changed, 25 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/base/Application.qbs b/share/qbs/imports/qbs/base/Application.qbs index 694cfb83b..63ffc6283 100644 --- a/share/qbs/imports/qbs/base/Application.qbs +++ b/share/qbs/imports/qbs/base/Application.qbs @@ -66,4 +66,12 @@ NativeBinary { qbs.installDir: installDir qbs.installSourceBase: isBundle ? destinationDirectory : outer } + + Group { + condition: installDebugInformation + fileTagsFilter: ["debuginfo_app"] + qbs.install: true + qbs.installDir: debugInformationInstallDir + qbs.installSourceBase: destinationDirectory + } } diff --git a/share/qbs/imports/qbs/base/Library.qbs b/share/qbs/imports/qbs/base/Library.qbs index 2a5183606..62e5f9d30 100644 --- a/share/qbs/imports/qbs/base/Library.qbs +++ b/share/qbs/imports/qbs/base/Library.qbs @@ -73,4 +73,18 @@ NativeBinary { qbs.install: true qbs.installDir: importLibInstallDir } + + Group { + condition: installDebugInformation + fileTagsFilter: { + if (isDynamicLibrary) + return ["debuginfo_dll"]; + else if (isLoadableModule) + return ["debuginfo_loadablemodule"]; + return []; + } + qbs.install: true + qbs.installDir: debugInformationInstallDir + qbs.installSourceBase: destinationDirectory + } } diff --git a/share/qbs/imports/qbs/base/NativeBinary.qbs b/share/qbs/imports/qbs/base/NativeBinary.qbs index 3597f348f..0928e96bb 100644 --- a/share/qbs/imports/qbs/base/NativeBinary.qbs +++ b/share/qbs/imports/qbs/base/NativeBinary.qbs @@ -36,6 +36,9 @@ Product { property bool install: false property string installDir + property bool installDebugInformation: false + property string debugInformationInstallDir: installDir + Depends { name: "bundle"; condition: isForDarwin } aggregate: { |