diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
| commit | 7439343d169095a510d122ad7c69646a5946cdce (patch) | |
| tree | 8540b2bac1e495533585a645e216eaab66b06bd2 /src/core/gyp_run.pro | |
| parent | 3ecd61aea90cc4b283ffe9409cc10f5fd3476ecf (diff) | |
| parent | f8c132ffb7cd32d52bbfe09caa811665a3cb1069 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ie4abadb076c51d070cbb05f29b9ebcd9705933ad
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 9f2a44d7b..89b751c4a 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -79,7 +79,7 @@ contains(QT_ARCH, "arm") { # If the toolchain does not explicitly specify to use NEON instructions # we use arm_neon_optional for ARMv7 and newer and let chromium decide # about the mfpu option. - contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1 + contains(MFPU, ".*neon.*"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1 else:!lessThan(MARMV, 7): GYP_CONFIG += arm_neon=0 arm_neon_optional=1 else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0 } else { |