From 75583bd60583a17402dade392e5ff9bc50d198ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 23 Jan 2012 13:17:23 +0100 Subject: [PATCH] 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 --- mkspecs/{unsupported => }/macx-clang/Info.plist.app | 0 mkspecs/{unsupported => }/macx-clang/Info.plist.lib | 0 mkspecs/{unsupported => }/macx-clang/qmake.conf | 6 +++--- mkspecs/{unsupported => }/macx-clang/qplatformdefs.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename mkspecs/{unsupported => }/macx-clang/Info.plist.app (100%) rename mkspecs/{unsupported => }/macx-clang/Info.plist.lib (100%) rename mkspecs/{unsupported => }/macx-clang/qmake.conf (85%) rename mkspecs/{unsupported => }/macx-clang/qplatformdefs.h (97%) 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" -- 2.7.4