diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:13:55 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:15:07 +0100 |
commit | d3dd527c3715188e2708ebcf5189076cbff9b104 (patch) | |
tree | 4a5c2a4e34d142c3a0cb690216a0d5df39708242 /src/core/gyp_run.pro | |
parent | 3bb1294bc59320e5699840e14490197d6a77b7aa (diff) | |
parent | e2609bcba621110920d847fcfbaf7edec4ae3827 (diff) |
Merge branch '5.8' into dev
Conflicts:
configure.json
Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6
Diffstat (limited to 'src/core/gyp_run.pro')
-rw-r--r-- | src/core/gyp_run.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 7ab8cbb13..c583845e9 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -91,7 +91,7 @@ contains(QT_ARCH, "arm") { !lessThan(MARMV, 7): GYP_CONFIG += arm_neon_optional=1 } - contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 + if(isEmpty(MARMV)|lessThan(MARMV, 7)):contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 contains(QMAKE_CFLAGS, "-mthumb"): GYP_CONFIG += arm_thumb=1 } |