diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-14 16:18:42 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-14 16:18:42 +0200 |
commit | 187c114987572f5492722b4d66b76366e3e50365 (patch) | |
tree | bc2bff3a99b333433f09537bc0b9c5fc709057e0 /tests/auto/blackbox/testdata/external-libs | |
parent | 6144279d346670130e0ecdfaf789beaa44cd6755 (diff) | |
parent | adc28c434853cf0fa17e95cc207e5a1c6eb761de (diff) |
Merge 1.9 into master
Change-Id: I6da76b0a53bf87105c4e7b48724d9760cb68e831
Diffstat (limited to 'tests/auto/blackbox/testdata/external-libs')
-rw-r--r-- | tests/auto/blackbox/testdata/external-libs/external-libs.qbs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs index 2ea2e988d..d2e983c3e 100644 --- a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs +++ b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs @@ -7,7 +7,10 @@ Project { name: "lib1" destinationDirectory: project.libDir Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } files: ["lib1.cpp"] } StaticLibrary { @@ -15,7 +18,10 @@ Project { destinationDirectory: project.libDir Depends { name: "cpp" } Depends { name: "lib1" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } files: ["lib2.cpp"] } CppApplication { |