diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-05 17:28:04 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-05 17:28:04 +0200 |
| commit | 7e5c48457edf7973ea7c59ab2f351c80f6e7a301 (patch) | |
| tree | 0585dce0c52e01b6df0c19aaa838f367c8b91d59 /examples | |
| parent | 631b1a1732e9837ae7eeaa5113c4b6c451bae569 (diff) | |
| parent | f47a71fe70312646a8bf155c7edce761f4be1204 (diff) | |
Merge 1.9 into master
This is intended to be the last merge from 1.9.
Change-Id: I7b9dec70a50726f4ed2d54152eab472f2c6b74ec
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.qbs | 2 | ||||
| -rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index 9a1046611..f1c7f3238 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.minimumIosVersion: "8.0" cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ] Group { diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj b/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj index 4dc8a6d4c..07f3a1a46 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj +++ b/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj @@ -267,7 +267,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -291,7 +291,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; |