diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-12-09 23:04:44 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-12-12 17:02:13 +0000 |
| commit | 4024632de96c3d12dfb787cfd9d2e5783ea8442e (patch) | |
| tree | b0131ea9dd1e6d75509757eec1479509b6e8f9aa /examples | |
| parent | d1fc24b9fecb698004d582255a640f50c31fec54 (diff) | |
Fix Cocoa examples
cpp.precompiledHeader no longer exists, and the iOS app was missing from
the examples qbs file.
Change-Id: I2e5f662fb28f6fcd0e4554866eb8828ca1be08ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cocoa-application/CocoaApplication.qbs | 8 | ||||
| -rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.qbs | 8 | ||||
| -rw-r--r-- | examples/examples.qbs | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs index 28d00b38a..2c26904a8 100644 --- a/examples/cocoa-application/CocoaApplication.qbs +++ b/examples/cocoa-application/CocoaApplication.qbs @@ -43,7 +43,7 @@ CppApplication { condition: qbs.targetOS.contains("macos") name: "Cocoa Application" - cpp.precompiledHeader: "CocoaApplication/CocoaApplication-Prefix.pch" + cpp.useObjcPrecompiledHeader: true cpp.frameworks: ["Cocoa"] @@ -53,7 +53,6 @@ CppApplication { "AppDelegate.h", "AppDelegate.m", "CocoaApplication-Info.plist", - "CocoaApplication-Prefix.pch", "main.m" ] } @@ -67,4 +66,9 @@ CppApplication { "MainMenu.xib" ] } + + Group { + files: ["CocoaApplication/CocoaApplication-Prefix.pch"] + fileTags: ["objc_pch_src"] + } } diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index 4e09f81ca..fa6e7320c 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -43,7 +43,7 @@ CppApplication { condition: qbs.targetOS.contains("ios") name: "Cocoa Touch Application" - cpp.precompiledHeader: "CocoaTouchApplication/CocoaTouchApplication-Prefix.pch" + cpp.useObjcPrecompiledHeader: true cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ] @@ -53,7 +53,6 @@ CppApplication { "AppDelegate.h", "AppDelegate.m", "CocoaTouchApplication-Info.plist", - "CocoaTouchApplication-Prefix.pch", "Default-568h@2x.png", "Default.png", "Default@2x.png", @@ -76,4 +75,9 @@ CppApplication { "MasterViewController_iPhone.xib" ] } + + Group { + files: ["CocoaTouchApplication/CocoaTouchApplication-Prefix.pch"] + fileTags: ["objc_pch_src"] + } } diff --git a/examples/examples.qbs b/examples/examples.qbs index 565b1703a..fa9b8809a 100644 --- a/examples/examples.qbs +++ b/examples/examples.qbs @@ -41,6 +41,7 @@ Project { references: [ "app-and-lib/app_and_lib.qbs", "cocoa-application/CocoaApplication.qbs", + "cocoa-touch-application/CocoaTouchApplication.qbs", "code-generator/code-generator.qbs", "collidingmice/collidingmice.qbs", "helloworld-complex/hello.qbs", |