diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 18 | ||||
| -rw-r--r-- | mkspecs/macx-icc/qmake.conf | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 2a164501bc..2bba73d795 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -157,13 +157,23 @@ macx-xcode { # Enable precompiled headers for multiple architectures QMAKE_CFLAGS_USE_PRECOMPILE = for (arch, VALID_ARCHS) { + icc_pch_style: \ + use_flag = "-pch-use " + else: \ + use_flag = -include + QMAKE_CFLAGS_USE_PRECOMPILE += \ -Xarch_$${arch} \ - -include${QMAKE_PCH_OUTPUT_$${arch}} + $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} + } + icc_pch_style { + QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} + QMAKE_CFLAGS_USE_PRECOMPILE = + } else { + QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE + QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE + QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE } - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} } diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index 6e43430342..7e10d1f413 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -94,6 +94,8 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10 +QMAKE_APPLE_DEVICE_ARCHS = x86_64 + include(../common/macx.conf) load(qt_config) |