diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
| commit | 1a3b34ea8cfb09dcb9022e897c4b494b623abd6a (patch) | |
| tree | b18be3e29e8ce191a99641985baa371a5d504682 /src/core | |
| parent | 1a0e71b130f55a3ce77c6b27ac898355253f1b9a (diff) | |
| parent | 2b953bf803aa74f4c6e1e3f06b22887c1ac80961 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
Diffstat (limited to 'src/core')
| -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 98ff29f78..4fab6cb97 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 { |