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

 Conflicts:
	src/core/download_manager_delegate_qt.cpp
	src/core/download_manager_delegate_qt.h
	src/core/render_widget_host_view_qt.cpp
	src/core/web_contents_adapter.cpp
	src/webengine/api/qquickwebengineview.cpp
	tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp

Change-Id: I2308414ce257ae5bb0fc9f6493aa111a267ff39b

2 files changed, 15 insertions, 0 deletions

diff --git a/config.tests/hostcompiler/hostcompiler.pro b/config.tests/hostcompiler/hostcompiler.pro
new file mode 100644
index 000000000..5a80246ab
--- /dev/null
+++ b/config.tests/hostcompiler/hostcompiler.pro
@@ -0,0 +1,9 @@
+option(host_build)
+
+gcc:equals(QT_ARCH, "x86_64"):contains(QT_TARGET_ARCH, "arm"):!contains(QT_TARGET_ARCH, "arm64") {
+    QMAKE_CXXFLAGS += -m32
+    QMAKE_LFLAGS += -m32
+}
+
+SOURCES = main.cpp
+
diff --git a/config.tests/hostcompiler/main.cpp b/config.tests/hostcompiler/main.cpp
new file mode 100644
index 000000000..96444ae8b
--- /dev/null
+++ b/config.tests/hostcompiler/main.cpp
@@ -0,0 +1,6 @@
+#include <stdio.h>
+int main()
+{
+   printf("This works\n");
+   return 0;
+}