diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-05-30 14:06:39 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-06-08 09:38:41 +0000 |
commit | f197d5832ba75b0619c0c70a31b1df73f100a5d3 (patch) | |
tree | 04b31a2bf86972ac24637a76532a1a37d8ff14b4 | |
parent | b3f6412f49929a1f0c99a8aae9254bc6becd49cd (diff) | |
download | qbs-f197d5832ba75b0619c0c70a31b1df73f100a5d3.tar.gz |
Fix TestBlackboxExamples with iOS profile
Change-Id: Ic5b37c323c726227311d5c0c73477da8043e3315
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | examples/baremetal/pca10040/greenblink/greenblink.qbs | 5 | ||||
-rw-r--r-- | examples/baremetal/stm32f103/greenblink/greenblink.qbs | 5 | ||||
-rw-r--r-- | examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs | 7 | ||||
-rw-r--r-- | examples/cocoa-application/app.qbs | 2 | ||||
-rw-r--r-- | examples/code-generator/code-generator.qbs | 1 | ||||
-rw-r--r-- | examples/grpc/grpc.qbs | 4 | ||||
-rw-r--r-- | examples/install-bundle/install-bundle.qbs | 9 | ||||
-rw-r--r-- | examples/protobuf/addressbook_cpp/addressbook_cpp.qbs | 2 | ||||
-rw-r--r-- | examples/protobuf/addressbook_objc/addressbook_objc.qbs | 2 |
9 files changed, 23 insertions, 14 deletions
diff --git a/examples/baremetal/pca10040/greenblink/greenblink.qbs b/examples/baremetal/pca10040/greenblink/greenblink.qbs index 04a592aee..ddf9cab24 100644 --- a/examples/baremetal/pca10040/greenblink/greenblink.qbs +++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs @@ -54,8 +54,9 @@ CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) return false; - return qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("keil") + return (qbs.toolchain.contains("gcc") + || qbs.toolchain.contains("keil")) + && !qbs.toolchain.contains("xcode") } name: "pca10040-greenblink" cpp.cLanguageVersion: "c99" diff --git a/examples/baremetal/stm32f103/greenblink/greenblink.qbs b/examples/baremetal/stm32f103/greenblink/greenblink.qbs index c4ca1aa35..8177cebab 100644 --- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs +++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs @@ -54,8 +54,9 @@ CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) return false; - return qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("keil") + return (qbs.toolchain.contains("gcc") + || qbs.toolchain.contains("keil")) + && !qbs.toolchain.contains("xcode") } name: "stm32f103-greenblink" cpp.cLanguageVersion: "c99" diff --git a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs index 3e9298921..c80e08efe 100644 --- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs +++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs @@ -54,9 +54,10 @@ CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) return false; - return qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("iar") - || qbs.toolchain.contains("keil") + return (qbs.toolchain.contains("gcc") + || qbs.toolchain.contains("iar") + || qbs.toolchain.contains("keil")) + && !qbs.toolchain.contains("xcode") } name: "stm32f4discovery-blueblink" cpp.cLanguageVersion: "c99" diff --git a/examples/cocoa-application/app.qbs b/examples/cocoa-application/app.qbs index f684786ad..f51f94e8b 100644 --- a/examples/cocoa-application/app.qbs +++ b/examples/cocoa-application/app.qbs @@ -52,7 +52,7 @@ import qbs CppApplication { Depends { condition: product.condition; name: "ib" } - condition: qbs.hostOS.contains("macos") + condition: qbs.targetOS.contains("macos") name: "Cocoa Application" cpp.useObjcPrecompiledHeader: true diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs index 1c2d2e445..f17c13095 100644 --- a/examples/code-generator/code-generator.qbs +++ b/examples/code-generator/code-generator.qbs @@ -63,6 +63,7 @@ Project { // Generate and build a hello-world application. CppApplication { + condition: qbs.targetOS === qbs.hostOS name: "hello-world" Depends { name: "hwgen" } Rule { diff --git a/examples/grpc/grpc.qbs b/examples/grpc/grpc.qbs index 9f80add04..c4f146ec0 100644 --- a/examples/grpc/grpc.qbs +++ b/examples/grpc/grpc.qbs @@ -36,7 +36,7 @@ Project { Application { Depends { name: "cpp" } Depends { name: "protobuf.cpp"; required: false } - condition: protobuf.cpp.present + condition: protobuf.cpp.present && qbs.targetOS === qbs.hostOS protobuf.cpp.useGrpc: true consoleApplication: true cpp.cxxLanguageVersion: "c++17" @@ -56,7 +56,7 @@ Project { Application { Depends { name: "cpp" } Depends { name: "protobuf.cpp"; required: false } - condition: protobuf.cpp.present + condition: protobuf.cpp.present && qbs.targetOS === qbs.hostOS protobuf.cpp.useGrpc: true consoleApplication: true cpp.cxxLanguageVersion: "c++17" diff --git a/examples/install-bundle/install-bundle.qbs b/examples/install-bundle/install-bundle.qbs index ac5a6c255..9cd856dbd 100644 --- a/examples/install-bundle/install-bundle.qbs +++ b/examples/install-bundle/install-bundle.qbs @@ -3,12 +3,16 @@ import qbs.FileInfo Project { CppApplication { + Depends { name: "bundle" } Depends { name: "windowutils" } Depends { name: "ib"; condition: qbs.targetOS.contains("darwin") } Depends { name: "Qt"; submodules: ["core", "gui", "widgets"] } + condition: qbs.targetOS.contains("macos") + || qbs.targetOS.contains("linux") + || qbs.targetOS.contains("windows") name: "window" - property bool isBundle: qbs.targetOS.contains("darwin") && bundle.isBundle + property bool isBundle: bundle.isBundle targetName: isBundle ? "Window" : "window" files: [ "main.cpp", @@ -22,7 +26,7 @@ Project { cpp.minimumMacosVersion: "10.10" Group { - fileTagsFilter: isBundle ? ["bundle.content"] : ["application"] + fileTagsFilter: qbs.targetOS.contains("darwin") && isBundle ? ["bundle.content"] : ["application"] qbs.install: true qbs.installDir: isBundle ? "Applications" : (qbs.targetOS.contains("windows") ? "" : "bin") qbs.installSourceBase: product.buildDirectory @@ -30,6 +34,7 @@ Project { } DynamicLibrary { + Depends { name: "bundle" } Depends { name: "cpp" } name: "windowutils" diff --git a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs index 36ad86338..09e0d3a08 100644 --- a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs +++ b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs @@ -2,7 +2,7 @@ import qbs CppApplication { consoleApplication: true - condition: protobuf.present + condition: protobuf.present && qbs.targetOS == qbs.hostOS Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++11" diff --git a/examples/protobuf/addressbook_objc/addressbook_objc.qbs b/examples/protobuf/addressbook_objc/addressbook_objc.qbs index 58ba5a899..a4343e060 100644 --- a/examples/protobuf/addressbook_objc/addressbook_objc.qbs +++ b/examples/protobuf/addressbook_objc/addressbook_objc.qbs @@ -2,7 +2,7 @@ import qbs CppApplication { consoleApplication: true - condition: protobuf.present && qbs.targetOS.contains("darwin") + condition: protobuf.present && qbs.targetOS.contains("macos") Depends { name: "cpp" } Depends { id: protobuf; name: "protobuf.objc"; required: false } |