diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2012-01-23 13:17:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-23 14:47:10 +0100 |
| commit | 75583bd60583a17402dade392e5ff9bc50d198ea (patch) | |
| tree | 5ad2f5ca4bc612f753ebc8170ea2d220d8973dd3 /mkspecs | |
| parent | 9ce5a0671a50fd04677506b869801d4ce5345acb (diff) | |
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>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/macx-clang/Info.plist.app (renamed from mkspecs/unsupported/macx-clang/Info.plist.app) | 0 | ||||
| -rw-r--r-- | mkspecs/macx-clang/Info.plist.lib (renamed from mkspecs/unsupported/macx-clang/Info.plist.lib) | 0 | ||||
| -rw-r--r-- | mkspecs/macx-clang/qmake.conf (renamed from mkspecs/unsupported/macx-clang/qmake.conf) | 6 | ||||
| -rw-r--r-- | mkspecs/macx-clang/qplatformdefs.h (renamed from mkspecs/unsupported/macx-clang/qplatformdefs.h) | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/unsupported/macx-clang/Info.plist.app b/mkspecs/macx-clang/Info.plist.app index 393b615475..393b615475 100644 --- a/mkspecs/unsupported/macx-clang/Info.plist.app +++ b/mkspecs/macx-clang/Info.plist.app diff --git a/mkspecs/unsupported/macx-clang/Info.plist.lib b/mkspecs/macx-clang/Info.plist.lib index 97609ed0ce..97609ed0ce 100644 --- a/mkspecs/unsupported/macx-clang/Info.plist.lib +++ b/mkspecs/macx-clang/Info.plist.lib diff --git a/mkspecs/unsupported/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index 319134421a..2d9b9bc6d9 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 index 87f99c1336..f7d9f7e682 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" |