From e5470cd11c3fd6804d496dff5002ae643e0293cb Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Tue, 19 Sep 2017 00:48:14 -0700
Subject: Fix Info.plist variable expansion warning in example projects

We match the minimum deployment target values of macOS 10.8 and iOS 6.1
from the corresponding Xcode projects present alongside each example.

Change-Id: Ideacac6cc8b58cf70baa22d5246b282ae0686d33
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 examples/cocoa-application/app.qbs                         | 2 +-
 examples/cocoa-touch-application/CocoaTouchApplication.qbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/cocoa-application/app.qbs b/examples/cocoa-application/app.qbs
index 366d49263..5d7b1cefe 100644
--- a/examples/cocoa-application/app.qbs
+++ b/examples/cocoa-application/app.qbs
@@ -43,7 +43,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 fa6e7320c..e2d7c9bc2 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs
+++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs
@@ -44,7 +44,7 @@ CppApplication {
     name: "Cocoa Touch Application"
 
     cpp.useObjcPrecompiledHeader: true
-
+    cpp.minimumIosVersion: "6.1"
     cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ]
 
     Group {
-- 
cgit v1.2.3


From 626fdc56c91e1f598da2845fb76089976695c96a Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Tue, 19 Sep 2017 18:13:31 -0700
Subject: Fix broken deployment target handling in install-bundle example

This fixes a build error with Xcode 9, which is more strict.

Change-Id: I10f67655ba525ffa909319b43c713947a55a9c7b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 examples/install-bundle/Storyboard.storyboard | 1 -
 examples/install-bundle/install-bundle.qbs    | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'examples')

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
-- 
cgit v1.2.3