diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-05-03 12:42:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 09:19:23 +0200 |
| commit | fde021c6d73f1785fb4763c01f3d5ed691373e33 (patch) | |
| tree | bafca5f5b565228c2b2e1a866f0c37c4f7483a6f /mkspecs/macx-clang/qmake.conf | |
| parent | 1014de4b2f6d4995d5e93efb70618169042c8b93 (diff) | |
Add mkspecs for 32-bit Mac OS X builds.
Add mkspecs/macx-clang-32
Add mkspecs/macx-g++-32
Add mkspecs/common/clang-mac.conf
Skip the rest of the Mac mkspecs (icc, llvm, g++40,
g++42, builder, Xcode, xlc) pending a cleanup where
we determine which ones to keep.
Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'mkspecs/macx-clang/qmake.conf')
| -rw-r--r-- | mkspecs/macx-clang/qmake.conf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index 2d9b9bc6d9..5077392b80 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -12,10 +12,6 @@ QMAKE_INCREMENTAL_STYLE = sublib 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 -QMAKE_OBJCXXFLAGS_PRECOMPILE = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} -QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +include(../common/clang-mac.conf) load(qt_config) |