aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata/separate-debug-info
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-08-01 18:10:36 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-08-02 08:06:09 +0000
commit1eff54864642c459263de9653e26d9f56af04ce9 (patch)
tree7dce149858243c62fcb325b2bffba58536a970f4 /tests/auto/blackbox/testdata/separate-debug-info
parentde5db8cfb87f7c54fddd6d9ecc124cd33201de2a (diff)
Do not access the bundle module unconditionally
It is a mistake that the NativeBinary item currently pulls in the bundle module unconditionally (and also that the module is enabled everywhere). We want to change that. Prepare for the change by removing all unconditional accesses to the module's properties. Change-Id: If57b8222c1a0e2b09c33520882446fa71401f1f1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/separate-debug-info')
-rw-r--r--tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs27
1 files changed, 21 insertions, 6 deletions
diff --git a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
index 1ecbe0f36..b28d7b822 100644
--- a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
+++ b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
@@ -77,7 +77,7 @@ Project {
name: "app4"
type: ["application"]
files: ["main.cpp"]
- bundle.isBundle: false
+ consoleApplication: true
cpp.separateDebugInformation: true
}
DynamicLibrary {
@@ -85,14 +85,20 @@ Project {
name: "foo4"
type: ["dynamiclibrary"]
files: ["foo.cpp"]
- bundle.isBundle: false
+ Properties {
+ condition: qbs.targetOS.contains("darwin")
+ bundle.isBundle: false
+ }
cpp.separateDebugInformation: true
}
LoadableModule {
Depends { name: "cpp" }
name: "bar4"
files: ["foo.cpp"]
- bundle.isBundle: false
+ Properties {
+ condition: qbs.targetOS.contains("darwin")
+ bundle.isBundle: false
+ }
cpp.separateDebugInformation: true
}
@@ -100,7 +106,10 @@ Project {
name: "app5"
type: ["application"]
files: ["main.cpp"]
- bundle.isBundle: false
+ Properties {
+ condition: qbs.targetOS.contains("darwin")
+ bundle.isBundle: false
+ }
cpp.separateDebugInformation: true
Properties {
condition: qbs.targetOS.contains("darwin")
@@ -112,7 +121,10 @@ Project {
name: "foo5"
type: ["dynamiclibrary"]
files: ["foo.cpp"]
- bundle.isBundle: false
+ Properties {
+ condition: qbs.targetOS.contains("darwin")
+ bundle.isBundle: false
+ }
cpp.separateDebugInformation: true
Properties {
condition: qbs.targetOS.contains("darwin")
@@ -123,7 +135,10 @@ Project {
Depends { name: "cpp" }
name: "bar5"
files: ["foo.cpp"]
- bundle.isBundle: false
+ Properties {
+ condition: qbs.targetOS.contains("darwin")
+ bundle.isBundle: false
+ }
cpp.separateDebugInformation: true
Properties {
condition: qbs.targetOS.contains("darwin")