diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:05:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:05:13 +0100 |
| commit | 1959699e48ce0e4379b42132dc9803da309e8c18 (patch) | |
| tree | 97f57ffc9aa8fa1993254e4631795c1f07cd0980 | |
| parent | 313e6548b0393af9069b043f65ea6e6c0a546487 (diff) | |
| parent | 4749a3ec61859e324f14add3008c41f92e6c2793 (diff) | |
| download | qtscript-1959699e48ce0e4379b42132dc9803da309e8c18.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia5a5e2779cf4afe3a7c5df7a4f16f38e100e785c
| -rw-r--r-- | src/script/script.pro | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index 228f486..c5d56c2 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -63,3 +63,14 @@ load(qt_module) # Override the module default, as it breaks compilation with libc++>=5.0: # auto_ptr is no longer part of the c++1z standard. CONFIG -= c++1z + +android-clang:equals(ANDROID_TARGET_ARCH, armeabi-v7a) { + QMAKE_CFLAGS_RELEASE -= -mthumb + QMAKE_CFLAGS_RELEASE *= -marm + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -mthumb + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO *= -marm + QMAKE_CXXFLAGS_RELEASE -= -mthumb + QMAKE_CXXFLAGS_RELEASE *= -marm + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -mthumb + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO *= -marm +} |