diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-05 03:01:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-05 03:01:51 +0100 |
| commit | b494dc90e5fcc159d7ca85dc8a614039235651e8 (patch) | |
| tree | 233f5f119c33886182fa8bc234945b56c53284e8 | |
| parent | 54176314d1c06ef387e797258cfc3993274665c9 (diff) | |
| parent | 2a106f26d6030063be5d25726d0f4b5e6a1d50b3 (diff) | |
| download | qtscript-b494dc90e5fcc159d7ca85dc8a614039235651e8.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I287ae9b4d3697d31383294800bf471fc3f4ee759
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION.TXT (renamed from src/3rdparty/javascriptcore/VERSION) | 0 | ||||
| -rw-r--r-- | src/script/script.pro | 11 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION.TXT index 13943b2..13943b2 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION.TXT 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 +} |