6 files changed, 17 insertions, 9 deletions
diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
index fd27643ec..f1b3d47b0 100644
--- a/src/buildtools/configure_host.pro
+++ b/src/buildtools/configure_host.pro
@@ -4,8 +4,9 @@ TEMPLATE = aux
 # Pick up the host toolchain
 option(host_build)
 
-GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
-GN_TARGET_CPU = $$gnArch($$WEBENGINE_ARCH)
+GN_HOST_CPU = $$gnArch($$QT_ARCH)
+!isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
+else: GN_TARGET_CPU = $$GN_HOST_CPU
 GN_OS = $$gnOS()
 
 clang: GN_CLANG = true
@@ -15,11 +16,11 @@ use_gold_linker: GN_USE_GOLD=true
 else: GN_USE_GOLD=false
 
 GN_V8_HOST_CPU = $$GN_HOST_CPU
-contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mips")|contains(GN_TARGET_CPU, "x86") {
+contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mipsel")|contains(GN_TARGET_CPU, "x86") {
     # The v8 snapshot need a host that matches bitwidth, so we build makesnapshot to 32-bit variants of host.
     contains(GN_V8_HOST_CPU, x64): GN_V8_HOST_CPU = "x86"
     else: contains(GN_V8_HOST_CPU, arm64): GN_V8_HOST_CPU = "arm"
-    else: contains(GN_V8_HOST_CPU, mips64): GN_V8_HOST_CPU = "mips"
+    else: contains(GN_V8_HOST_CPU, mips64el): GN_V8_HOST_CPU = "mipsel"
 }
 
 # We always use the gcc_toolchain, because clang_toolchain is just
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 076d8a3c5..60cfa6857 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -98,6 +98,8 @@ contains(QT_ARCH, "mips"):!host_build {
 
 host_build {
     gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
+    GN_HOST_CPU = $$gnArch($$QT_ARCH)
+    gn_args += host_cpu=\"$$GN_HOST_CPU\"
     # Don't bother trying to use system libraries in this case
     gn_args += use_glib=false
     gn_args += use_system_libffi=false
@@ -106,9 +108,8 @@ host_build {
     gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
     cross_compile {
         gn_args += v8_snapshot_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:v8_snapshot\"
-        GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
         GN_TARGET_CPU = $$gnArch($$QT_ARCH)
-        gn_args += host_cpu=\"$$GN_HOST_CPU\" target_cpu=\"$$GN_TARGET_CPU\"
+        gn_args += target_cpu=\"$$GN_TARGET_CPU\"
     }
     !contains(QT_CONFIG, no-pkg-config) {
         # Strip '>2 /dev/null' from $$pkgConfigExecutable()
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index cf22273e4..169e8e54b 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -1283,7 +1283,6 @@ void RenderWidgetHostViewQt::handleInputMethodEvent(QInputMethodEvent *ev)
         // to the same focused object, and cancelling the composition on the next event loop tick.
         if (!m_receivedEmptyImeText && m_imeInProgress && !hasSelection) {
             m_receivedEmptyImeText = true;
-            m_imeInProgress = false;
             QInputMethodEvent *eventCopy = new QInputMethodEvent(*ev);
             QGuiApplication::postEvent(qApp->focusObject(), eventCopy);
         } else {
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 22ff13d48..aae0efea8 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1095,9 +1095,10 @@ void QQuickWebEngineViewPrivate::didFindText(quint64 requestId, int matchCount)
 
 void QQuickWebEngineViewPrivate::didPrintPage(quint64 requestId, const QByteArray &result)
 {
+    Q_Q(QQuickWebEngineView);
     QJSValue callback = m_callbacks.take(requestId);
     QJSValueList args;
-    args.append(QJSValue(result.data()));
+    args.append(qmlEngine(q)->toScriptValue(result));
     callback.call(args);
 }
 
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index 2eeda6e8a..ec678672c 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -69,7 +69,7 @@
 
     \section2 Windows
 
-    On Windows, Visual Studio 2015 and Windows 10 SDK are required.
+    On Windows, Visual Studio 2015 or 2017 and Windows 10 SDK are required.
 
     \section2 Linux
 
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index 3b27ca146..e54c5d507 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -141,6 +141,12 @@
     \warning This function works only for HTML. For other MIME types (such as XHTML or SVG),
     setContent() should be used instead.
 
+    \note Content larger than 2 MB cannot be displayed, because setHtml()
+    converts the provided HTML to percent-encoding and places \c data: in front
+    of it to create the URL that it navigates to. Thereby, the provided code
+    becomes a URL that exceeds the 2 MB limit set by Chromium. If the content is
+    too large, the loadFinished() signal is triggered with \c success=false.
+
     \sa load(), setContent(), QWebEnginePage::toHtml(), QWebEnginePage::setContent()
 */