diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-11-25 15:54:59 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-12-13 09:27:30 +0000 |
commit | 8538cb992043eb680c1b7acaf133e4147e1db86a (patch) | |
tree | 3417bc4787d2ed881ac400ceea31ffa6c261a5f1 | |
parent | d5fa3a4eb279c1ad9f0247156e5cf015261e39f0 (diff) | |
download | qbs-8538cb992043eb680c1b7acaf133e4147e1db86a.tar.gz |
Convenience products: Make installDebugInformation consistent
... with install by default.
If we have an installable product with debug info, it's likely we want
to install the debug info as well.
Task-number: QTCREATORBUG-26419
Change-Id: I6057bcd1620bcf207b38397b7f6f45be4187e44e
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
4 files changed, 13 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/base/NativeBinary.qbs b/share/qbs/imports/qbs/base/NativeBinary.qbs index c51f132ee..900ed9faa 100644 --- a/share/qbs/imports/qbs/base/NativeBinary.qbs +++ b/share/qbs/imports/qbs/base/NativeBinary.qbs @@ -39,7 +39,7 @@ Product { // or if it is multiplexed and it's the aggregate product readonly property bool _installable: !multiplexed || !aggregate || !multiplexConfigurationId - property bool installDebugInformation: false + property bool installDebugInformation: install property string debugInformationInstallDir: installDir Depends { name: "bundle"; condition: isForDarwin } diff --git a/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs index d3f91662a..e4e050213 100644 --- a/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs +++ b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs @@ -17,6 +17,7 @@ Project { } qbs.installPrefix: "/usr" install: true + installDebugInformation: false installDir: "bin" Group { fileTagsFilter: "obj" diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs index 6b7fab390..0a06125eb 100644 --- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs +++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs @@ -26,6 +26,7 @@ Project { multiplexByQbsProperties: [] install: true + installDebugInformation: false installDir: "" } @@ -45,6 +46,7 @@ Project { qbs.buildVariants: ["release"] install: true + installDebugInformation: false installDir: "" } @@ -62,6 +64,7 @@ Project { multiplexByQbsProperties: [] install: true + installDebugInformation: false installDir: "" } @@ -76,6 +79,7 @@ Project { cpp.minimumIosVersion: "8.0" install: true + installDebugInformation: false installDir: "" } @@ -96,6 +100,7 @@ Project { qbs.buildVariants: "debug" install: true + installDebugInformation: false installDir: "" } @@ -112,6 +117,7 @@ Project { qbs.buildVariants: ["debug", "profiling"] install: true + installDebugInformation: false installDir: "" } @@ -128,6 +134,7 @@ Project { qbs.buildVariants: ["release", "debug", "profiling"] install: true + installDebugInformation: false installDir: "" } @@ -144,6 +151,7 @@ Project { qbs.buildVariants: ["debug", "profiling"] install: true + installDebugInformation: false installDir: "" } @@ -159,6 +167,7 @@ Project { qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion) qbs.buildVariants: ["debug", "profiling"] install: true + installDebugInformation: false installDir: "" } DynamicLibrary { @@ -172,6 +181,7 @@ Project { qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion) qbs.buildVariants: ["debug", "profiling"] install: true + installDebugInformation: false installDir: "" } } diff --git a/tests/auto/blackbox/testdata/installable/installable.qbs b/tests/auto/blackbox/testdata/installable/installable.qbs index 1973ec8f9..de93cf61f 100644 --- a/tests/auto/blackbox/testdata/installable/installable.qbs +++ b/tests/auto/blackbox/testdata/installable/installable.qbs @@ -11,6 +11,7 @@ Project { } install: true + installDebugInformation: false installDir: "" } |