diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-07 00:00:10 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-07 00:00:10 (GMT) |
| commit | 9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f (patch) | |
| tree | 84d3836ef6db244633c569e8c5bc77809416ca9f /mkspecs/unsupported/macx-clang/qmake.conf | |
| parent | 1f7fe30841f6bd3557c9c5d90faeaeb162c4a967 (diff) | |
| parent | fe949effc79830f7e40ddd238114dc8e0553291c (diff) | |
| download | Qt-9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f.zip Qt-9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f.tar.gz Qt-9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'mkspecs/unsupported/macx-clang/qmake.conf')
| -rw-r--r-- | mkspecs/unsupported/macx-clang/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/unsupported/macx-clang/qmake.conf b/mkspecs/unsupported/macx-clang/qmake.conf index 17892e8..3191344 100644 --- a/mkspecs/unsupported/macx-clang/qmake.conf +++ b/mkspecs/unsupported/macx-clang/qmake.conf @@ -10,8 +10,8 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib include(../../common/mac.conf) +include(../../common/gcc-base-macx.conf) include(../../common/clang.conf) -include(../../common/gcc-base-mac.conf) QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE |