diff options
| author | Ilya Grechuhin <i.grechuhin@gmail.com> | 2017-09-29 11:40:11 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-09-29 11:41:51 +0300 |
| commit | 46deebc993555d639dbfa412df89d3084959b319 (patch) | |
| tree | 7dd966d86384ff9e3605015ad97d168e7d79b8bd /tools | |
| parent | 109676331813d9feca68c6b71a65da6b5106d20b (diff) | |
[google] Fixed qmake builds.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkspecs/android-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | tools/mkspecs/iphonedevice-clang/qmake.conf | 1 | ||||
| -rw-r--r-- | tools/mkspecs/iphonesimulator-clang/qmake.conf | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index 0a0255b887..756a8d1156 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -13,6 +13,8 @@ ANDROID_PLATFORM = android-15 GCC_VERSION = 4.9 +QMAKE_APPLE_DEVICE_ARCHS = $$ANDROID_TARGET_ABI + MAKEFILE_GENERATOR = UNIX QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm/prebuilt/$$(NDK_HOST)/bin/clang QMAKE_CC = $$QMAKE_COMPILER diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index dd0a98258c..0974b4716f 100644 --- a/tools/mkspecs/iphonedevice-clang/qmake.conf +++ b/tools/mkspecs/iphonedevice-clang/qmake.conf @@ -20,6 +20,7 @@ QMAKE_INCREMENTAL_STYLE = sublib QMAKE_COMPILER = clang QMAKE_CC = clang -arch $$BUILD_ARCH QMAKE_CXX = clang++ -arch $$BUILD_ARCH +QMAKE_APPLE_DEVICE_ARCHS = $$BUILD_ARCH QMAKE_RESOURCE = diff --git a/tools/mkspecs/iphonesimulator-clang/qmake.conf b/tools/mkspecs/iphonesimulator-clang/qmake.conf index 860bb4bf9f..a49a22e575 100644 --- a/tools/mkspecs/iphonesimulator-clang/qmake.conf +++ b/tools/mkspecs/iphonesimulator-clang/qmake.conf @@ -20,6 +20,7 @@ QMAKE_INCREMENTAL_STYLE = sublib QMAKE_COMPILER = clang QMAKE_CC = clang -arch $$BUILD_ARCH QMAKE_CXX = clang++ -arch $$BUILD_ARCH +QMAKE_APPLE_SIMULATOR_ARCHS = $$BUILD_ARCH QMAKE_OBJECTIVE_CC = $$QMAKE_CC -fobjc-abi-version=2 -fobjc-legacy-dispatch QMAKE_RESOURCE = |