Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/core/browser_context_qt.cpp
	src/webengine/api/qquickwebengineview_p.h

Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c

1 files changed, 2 insertions, 1 deletions

diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index f79972a2e..137b600b9 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -61,6 +61,7 @@ cross_compile {
         !isEmpty(MARMV) {
             MARMV = $$split(MARMV,)
             MARMV = $$member(MARMV, 0)
+            lessThan(MARMV, 6): error("$$MARCH architecture is not supported")
             GYP_ARGS += "-D arm_version=\"$$MARMV\""
         }
 
@@ -69,7 +70,7 @@ cross_compile {
             # 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"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1"
+            contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1"
             else:!lessThan(MARMV, 7): GYP_ARGS += "-D arm_neon=0 -D arm_neon_optional=1"
             else: GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=0 -D arm_neon_optional=0"
         }