diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 01:45:22 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 10:18:11 -0700 |
| commit | d17ea24c73b5b58fa6f5d3f00d82de6f53459cfc (patch) | |
| tree | 4cf939e70277190dad948b16849320e4452c5d78 /examples | |
| parent | 440d78eca9011d13c88f0e0fd84f62661806eb49 (diff) | |
| parent | 33e9cd462a6c7b6dc552669361f4321ffdb22ff3 (diff) | |
Merge 1.5 into 1.6
Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cocoa-application/CocoaApplication.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs index a04acfb6b..28d00b38a 100644 --- a/examples/cocoa-application/CocoaApplication.qbs +++ b/examples/cocoa-application/CocoaApplication.qbs @@ -40,7 +40,7 @@ import qbs 1.0 CppApplication { Depends { condition: product.condition; name: "ib" } - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") name: "Cocoa Application" cpp.precompiledHeader: "CocoaApplication/CocoaApplication-Prefix.pch" |