From 7c1bbde476b39841549eb87331d97fe0b76e0178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Wed, 11 Sep 2013 15:23:03 +0200
Subject: [PATCH] Move iOS makespec out of unsupported directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's a supported platform from 5.2, and we want build-scripts/CI/etc to
adapt to the change as soon as possible.

Change-Id: I8c78351191f59a6ecab33acc0829d2535379c787
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
---
 .../{unsupported => }/macx-ios-clang/Info.plist.app  |  0
 .../{unsupported => }/macx-ios-clang/Info.plist.lib  |  0
 mkspecs/{unsupported => }/macx-ios-clang/qmake.conf  | 12 ++++++------
 .../{unsupported => }/macx-ios-clang/qplatformdefs.h |  2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename mkspecs/{unsupported => }/macx-ios-clang/Info.plist.app (100%)
 rename mkspecs/{unsupported => }/macx-ios-clang/Info.plist.lib (100%)
 rename mkspecs/{unsupported => }/macx-ios-clang/qmake.conf (71%)
 rename mkspecs/{unsupported => }/macx-ios-clang/qplatformdefs.h (97%)

diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.app b/mkspecs/macx-ios-clang/Info.plist.app
similarity index 100%
rename from mkspecs/unsupported/macx-ios-clang/Info.plist.app
rename to mkspecs/macx-ios-clang/Info.plist.app
diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib b/mkspecs/macx-ios-clang/Info.plist.lib
similarity index 100%
rename from mkspecs/unsupported/macx-ios-clang/Info.plist.lib
rename to mkspecs/macx-ios-clang/Info.plist.lib
diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf
similarity index 71%
rename from mkspecs/unsupported/macx-ios-clang/qmake.conf
rename to mkspecs/macx-ios-clang/qmake.conf
index 3dc2715a5f..ebc07a3d5a 100644
--- a/mkspecs/unsupported/macx-ios-clang/qmake.conf
+++ b/mkspecs/macx-ios-clang/qmake.conf
@@ -15,11 +15,11 @@ DEFINES                += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_N
 # Universal target (iPhone and iPad)
 QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2
 
-include(../../common/ios.conf)
-include(../../common/gcc-base-mac.conf)
-include(../../common/clang.conf)
-include(../../common/clang-mac.conf)
-include(../../common/ios/clang.conf)
-include(../../common/ios/qmake.conf)
+include(../common/ios.conf)
+include(../common/gcc-base-mac.conf)
+include(../common/clang.conf)
+include(../common/clang-mac.conf)
+include(../common/ios/clang.conf)
+include(../common/ios/qmake.conf)
 
 load(qt_config)
diff --git a/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h b/mkspecs/macx-ios-clang/qplatformdefs.h
similarity index 97%
rename from mkspecs/unsupported/macx-ios-clang/qplatformdefs.h
rename to mkspecs/macx-ios-clang/qplatformdefs.h
index 581ad0d485..c01b619f9a 100644
--- a/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h
+++ b/mkspecs/macx-ios-clang/qplatformdefs.h
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "../../common/mac/qplatformdefs.h"
+#include "../common/mac/qplatformdefs.h"