diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-23 10:34:41 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-23 10:34:41 +0100 |
| commit | bd21380419fa7e80ad9722ce058841c246421d14 (patch) | |
| tree | 707032fdd49bf0b6e08d173edae60e44105d80ff /examples | |
| parent | 4952ec5172b67d38637523bd9f22fdef4d51b5c0 (diff) | |
| parent | ffe5d28e545b6d9d27ba11e14c6084826d936f30 (diff) | |
Merge 1.11 into master
Change-Id: Ic3e40083dcec6421fb5b55e8a4ccba7b49298c54
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cocoa-application/app.qbs | 2 | ||||
| -rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.qbs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/cocoa-application/app.qbs b/examples/cocoa-application/app.qbs index f51f94e8b..f684786ad 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.targetOS.contains("macos") + condition: qbs.hostOS.contains("macos") name: "Cocoa Application" cpp.useObjcPrecompiledHeader: true diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index f1c7f3238..f8db6768f 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -53,9 +53,11 @@ import qbs 1.0 CppApplication { Depends { condition: product.condition; name: "ib" } - condition: qbs.targetOS.contains("ios") + condition: qbs.hostOS.contains("macos") name: "Cocoa Touch Application" + qbs.targetPlatform: "ios" + cpp.useObjcPrecompiledHeader: true cpp.minimumIosVersion: "8.0" cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ] |