summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-10-08 16:08:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-09 11:50:29 +0200
commit6408bb6b453d327203ebd148aa8f2483a6dc0083 (patch)
tree8ef6c73fc798688a522065b261f93d6aeab83b9d /mkspecs
parentd6b2608be18e84e6deb894dee1930550d887ab5a (diff)
iOS: Update Xcode check to include Xcode 5.0
Change-Id: Icfd3a47c8bac91e66625cbeb6dd9b56a0d5f5e79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/ios/default_pre.prf5
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/ios/default_pre.prf b/mkspecs/features/ios/default_pre.prf
index 5db8d98d6c..de5a9170d7 100644
--- a/mkspecs/features/ios/default_pre.prf
+++ b/mkspecs/features/ios/default_pre.prf
@@ -4,5 +4,6 @@ load(default_pre)
# Check for supported Xcode versions
lessThan(QMAKE_XCODE_VERSION, "4.3"): \
error("This mkspec requires Xcode 4.3 or later")
-!lessThan(QMAKE_XCODE_VERSION, "4.7"): \
- warning("The version of Xcode installed on this system is not recognized - custom compiler settings may be necessary")
+!contains(QMAKE_XCODE_VERSION, ^(4\\.[3456]|5\\.[0])$): \
+ warning("The version of Xcode installed on this system ($$QMAKE_XCODE_VERSION)" \
+ "has not been tested fully - custom compiler settings may be necessary")