diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-26 08:43:55 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-26 08:44:32 +0200 |
| commit | 86d69f208f93f048d858125299b9b2639a1f146a (patch) | |
| tree | ccc6f3a1960d667e395a5b8fb261589188a965a6 /examples | |
| parent | b6a5e43c143dab4bec349fb97d4a6c5589475197 (diff) | |
| parent | 70be4ec8d868a5f721c3d1e48b2e527da7178f26 (diff) | |
Merge remote-tracking branch 'origin/1.9'
Change-Id: I40c1ea23e7351deac715958783158c089e65a02d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cocoa-application/app.qbs | 2 | ||||
| -rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.qbs | 2 | ||||
| -rw-r--r-- | examples/install-bundle/Storyboard.storyboard | 1 | ||||
| -rw-r--r-- | examples/install-bundle/install-bundle.qbs | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/examples/cocoa-application/app.qbs b/examples/cocoa-application/app.qbs index 6416435c0..f51f94e8b 100644 --- a/examples/cocoa-application/app.qbs +++ b/examples/cocoa-application/app.qbs @@ -56,7 +56,7 @@ CppApplication { name: "Cocoa Application" cpp.useObjcPrecompiledHeader: true - + cpp.minimumMacosVersion: "10.8" cpp.frameworks: ["Cocoa"] Group { diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index b0bdf2446..9a1046611 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -57,7 +57,7 @@ CppApplication { name: "Cocoa Touch Application" cpp.useObjcPrecompiledHeader: true - + cpp.minimumIosVersion: "6.1" cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ] Group { diff --git a/examples/install-bundle/Storyboard.storyboard b/examples/install-bundle/Storyboard.storyboard index 41510ae29..06aef2bcf 100644 --- a/examples/install-bundle/Storyboard.storyboard +++ b/examples/install-bundle/Storyboard.storyboard @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="8152.3" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <deployment version="0.0" identifier="macosx"/> <development version="5100" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8152.3"/> </dependencies> diff --git a/examples/install-bundle/install-bundle.qbs b/examples/install-bundle/install-bundle.qbs index 3151f5517..7ec4e8f78 100644 --- a/examples/install-bundle/install-bundle.qbs +++ b/examples/install-bundle/install-bundle.qbs @@ -19,6 +19,8 @@ Project { "Storyboard.storyboard" ] + cpp.minimumMacosVersion: "10.10" + Group { fileTagsFilter: isBundle ? ["bundle.content"] : ["application"] qbs.install: true |