diff options
| -rw-r--r-- | mkspecs/common/ios/qmake.conf | 6 | ||||
| -rw-r--r-- | mkspecs/unsupported/macx-iosdevice-clang/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/unsupported/macx-iossimulator-clang/qmake.conf | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf index 260eaaeddb..9235e68b0d 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/ios/qmake.conf @@ -39,9 +39,3 @@ QMAKE_LIBS_OPENGL_ES2 = -framework OpenGLES # No desktop OpenGL QMAKE_INCDIR_OPENGL = QMAKE_LIBS_OPENGL = - -# Objective-C/C++ precompile flags -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 diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf index 330dcf6c3c..3e1a669905 100644 --- a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf +++ b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf @@ -12,6 +12,7 @@ QMAKE_IOS_TARGET_ARCH = armv7 include(../../common/mac.conf) include(../../common/gcc-base-ios.conf) include(../../common/clang.conf) +include(../../common/clang-mac.conf) include(../../common/ios.conf) include(../../common/ios/versions.conf) include(../../common/ios/clang.conf) diff --git a/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf b/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf index bf334b9960..a8072fed00 100644 --- a/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf +++ b/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf @@ -13,6 +13,7 @@ QMAKE_IOS_OBJ_CFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch include(../../common/mac.conf) include(../../common/gcc-base-ios.conf) include(../../common/clang.conf) +include(../../common/clang-mac.conf) include(../../common/ios.conf) include(../../common/ios/versions.conf) include(../../common/ios/clang.conf) |