From: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Date: Mon, 23 Jan 2012 12:17:23 +0000 (+0100)
Subject: Move Clang mkspec for Mac OS X out of unsupported
X-Git-Tag: qt-v5.0.0-alpha1~1633
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75583bd60583a17402dade392e5ff9bc50d198ea;p=profile%2Fivi%2Fqtbase.git

Move Clang mkspec for Mac OS X out of unsupported

The plan is to make it the default mkspec for Qt 5 on Mac OS X.

Change-Id: I49cf619a06fd7155dfbddc377558327b4be09cef
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
---

diff --git a/mkspecs/unsupported/macx-clang/Info.plist.app b/mkspecs/macx-clang/Info.plist.app
similarity index 100%
rename from mkspecs/unsupported/macx-clang/Info.plist.app
rename to mkspecs/macx-clang/Info.plist.app
diff --git a/mkspecs/unsupported/macx-clang/Info.plist.lib b/mkspecs/macx-clang/Info.plist.lib
similarity index 100%
rename from mkspecs/unsupported/macx-clang/Info.plist.lib
rename to mkspecs/macx-clang/Info.plist.lib
diff --git a/mkspecs/unsupported/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf
similarity index 85%
rename from mkspecs/unsupported/macx-clang/qmake.conf
rename to mkspecs/macx-clang/qmake.conf
index 3191344..2d9b9bc 100644
--- a/mkspecs/unsupported/macx-clang/qmake.conf
+++ b/mkspecs/macx-clang/qmake.conf
@@ -9,9 +9,9 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_v
 QT += core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
-include(../../common/mac.conf)
-include(../../common/gcc-base-macx.conf)
-include(../../common/clang.conf)
+include(../common/mac.conf)
+include(../common/gcc-base-macx.conf)
+include(../common/clang.conf)
 
 QMAKE_OBJCFLAGS_PRECOMPILE       = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_OBJCFLAGS_USE_PRECOMPILE   = $$QMAKE_CFLAGS_USE_PRECOMPILE
diff --git a/mkspecs/unsupported/macx-clang/qplatformdefs.h b/mkspecs/macx-clang/qplatformdefs.h
similarity index 97%
rename from mkspecs/unsupported/macx-clang/qplatformdefs.h
rename to mkspecs/macx-clang/qplatformdefs.h
index 87f99c1..f7d9f7e 100644
--- a/mkspecs/unsupported/macx-clang/qplatformdefs.h
+++ b/mkspecs/macx-clang/qplatformdefs.h
@@ -39,5 +39,5 @@
 **
 ****************************************************************************/
 
-#include "../../common/mac/qplatformdefs.h"
+#include "../common/mac/qplatformdefs.h"