Merge remote-tracking branch 'origin/5.11' into 5.12

Conflicts:
	src/3rdparty
	src/core/core_common.pri

Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127

41 files changed, 270 insertions, 52 deletions

diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp
index 93bc80c97..497653d9c 100644
--- a/config.tests/xml2/xml2.cpp
+++ b/config.tests/xml2/xml2.cpp
@@ -27,9 +27,6 @@
 ****************************************************************************/
 
 #include <libxml/xmlversion.h>
-#if defined(LIBXML_CATALOG_ENABLED)
-#error "libxml catalog enabled"
-#endif
 #if !defined(LIBXML_ICU_ENABLED)
 #error "libxml icu not enabled"
 #endif
diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2
new file mode 100644
index 000000000..753e83fa7
--- /dev/null
+++ b/dist/changes-5.11.2
@@ -0,0 +1,78 @@
+Qt 5.11.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                              Qt 5.11.2 Changes                           *
+****************************************************************************
+
+Chromium
+--------
+
+ - Security fixes from Chromium up to version 68.0.3440.75, including:
+     * CVE-2018-4117
+     * CVE-2018-6150
+     * CVE-2018-6152
+     * CVE-2018-6155
+     * CVE-2018-6158
+     * CVE-2018-6159
+     * CVE-2018-6161
+     * CVE-2018-6162
+     * CVE-2018-6163
+     * CVE-2018-6164
+     * CVE-2018-6165
+     * CVE-2018-6167
+     * CVE-2018-6168
+     * CVE-2018-6172
+     * CVE-2018-6175
+     * CVE-2018-6177
+     * Security Bug 683418
+     * Security Bug 831117
+     * Security Bug 838886
+     * Security Bug 839197
+     * Security Bug 840695
+     * Security Bug 854887
+     * Security Bug 860721
+     * Security Bug 861571
+
+
+General
+-------
+
+    * [QTBUG-59891] Popups are now closed when parent window is moved.
+    * [QTBUG-67801] Fixed assert with some AMD CPUs on Windows.
+    * [QTBUG-68699] Fixed another crash with non-integer Qt scaling.
+    * [QTBUG-69231] Fixed keyboard modifiers on drop events.
+    * [QTBUG-69236] Fixed --enable-webgl-software-rendering to ignore blacklist
+      of software OpenGL.
+    * [QTBUG-69359] Fixed crash in DevTools openInNewTab handling
+    * [QTBUG-69372] QWebEngineUrlRequestJob::initiator() now differs
+      between unique origins and unknown origins.
+    * [QTBUG-69605] HSTS state is now persistent with appropriate profiles.
+    * [QTBUG-69639] Work around MSVC compiler error affecting printing on
+      32-bit Windows.
+    * [QTBUG-69904] JavaScript worldID can now be up to 256 (up from 11),
+      and the limit is now documented.
+    * [QTBUG-70034] Fixed qtwebengine_convert_dict failing on certain
+      dictionaries.
+
+Build
+-----
+
+    * [QTBUG-50554] Update libvpx check to match standard versions.
+    * [QTBUG-69121] Fixed shadow builds on read-only sources.
diff --git a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
index 190604fc4..3188bb299 100644
--- a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+++ b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
@@ -136,4 +136,14 @@
     \printuntil Action
     \skipto Escape
     \printuntil /^\ {4}\}/
+
+    \section1 Files and Attributions
+
+    The example uses icons from the Tango Icon Library:
+
+    \table
+    \row
+        \li \l{quicknanobrowser-tango}{Tango Icon Library}
+        \li Public Domain
+    \endtable
 */
diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING b/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING
new file mode 100644
index 000000000..220881da6
--- /dev/null
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING
@@ -0,0 +1 @@
+The icons in this repository are herefore released into the Public Domain.
diff --git a/examples/webengine/quicknanobrowser/icons/go-next.png b/examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png
index 6f3f65d33..6f3f65d33 100644
--- a/examples/webengine/quicknanobrowser/icons/go-next.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png
diff --git a/examples/webengine/quicknanobrowser/icons/go-previous.png b/examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png
index 93be3d1ee..93be3d1ee 100644
--- a/examples/webengine/quicknanobrowser/icons/go-previous.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png
diff --git a/examples/webengine/quicknanobrowser/icons/process-stop.png b/examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png
index b68290bf1..b68290bf1 100644
--- a/examples/webengine/quicknanobrowser/icons/process-stop.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png
diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json b/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json
new file mode 100644
index 000000000..4e5a44448
--- /dev/null
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json
@@ -0,0 +1,24 @@
+{
+    "Id": "quicknanobrowser-tango",
+    "Name": "Tango Icon Library",
+    "QDocModule": "qtwebengine",
+    "QtUsage": "Used in WebEngine Quick Nano Browser example.",
+
+    "QtParts": [ "examples" ],
+    "Description": "Selected icons from the Tango Icon Library",
+    "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
+    "Version": "0.8.90",
+    "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
+    "LicenseId": "DocumentRef-PublicDomain",
+    "License": "Public Domain",
+    "LicenseFile": "COPYING",
+    "Copyright": "Ulisse Perusin <uli.peru@gmail.com>
+Steven Garrity <sgarrity@silverorange.com>
+Lapo Calamandrei <calamandrei@gmail.com>
+Ryan Collier <rcollier@novell.com>
+Rodney Dawes <dobey@novell.com>
+Andreas Nilsson <nisses.mail@home.se>
+Tuomas Kuosmanen <tigert@tigert.com>
+Garrett LeSage <garrett@novell.com>
+Jakub Steiner <jimmac@novell.com>"
+}
diff --git a/examples/webengine/quicknanobrowser/icons/view-refresh.png b/examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png
index cab4d02c7..cab4d02c7 100644
--- a/examples/webengine/quicknanobrowser/icons/view-refresh.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png
diff --git a/examples/webengine/quicknanobrowser/resources.qrc b/examples/webengine/quicknanobrowser/resources.qrc
index 694f8d19b..c6270897d 100644
--- a/examples/webengine/quicknanobrowser/resources.qrc
+++ b/examples/webengine/quicknanobrowser/resources.qrc
@@ -7,9 +7,9 @@
         <file>FullScreenNotification.qml</file>
     </qresource>
     <qresource prefix="icons">
-        <file alias="go-next.png">icons/go-next.png</file>
-        <file alias="go-previous.png">icons/go-previous.png</file>
-        <file alias="process-stop.png">icons/process-stop.png</file>
-        <file alias="view-refresh.png">icons/view-refresh.png</file>
+        <file alias="go-next.png">icons/3rdparty/go-next.png</file>
+        <file alias="go-previous.png">icons/3rdparty/go-previous.png</file>
+        <file alias="process-stop.png">icons/3rdparty/process-stop.png</file>
+        <file alias="view-refresh.png">icons/3rdparty/view-refresh.png</file>
     </qresource>
 </RCC>
diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING b/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING
new file mode 100644
index 000000000..220881da6
--- /dev/null
+++ b/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING
@@ -0,0 +1 @@
+The icons in this repository are herefore released into the Public Domain.
diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json
new file mode 100644
index 000000000..91a0899c6
--- /dev/null
+++ b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json
@@ -0,0 +1,24 @@
+{
+    "Id": "cookiebrowser-tango",
+    "Name": "Tango Icon Library",
+    "QDocModule": "qtwebengine",
+    "QtUsage": "Used in WebEngine Cookie Browser example.",
+
+    "QtParts": [ "examples" ],
+    "Description": "Selected icons from the Tango Icon Library",
+    "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
+    "Version": "0.8.90",
+    "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
+    "LicenseId": "DocumentRef-PublicDomain",
+    "License": "Public Domain",
+    "LicenseFile": "COPYING",
+    "Copyright": "Ulisse Perusin <uli.peru@gmail.com>
+Steven Garrity <sgarrity@silverorange.com>
+Lapo Calamandrei <calamandrei@gmail.com>
+Ryan Collier <rcollier@novell.com>
+Rodney Dawes <dobey@novell.com>
+Andreas Nilsson <nisses.mail@home.se>
+Tuomas Kuosmanen <tigert@tigert.com>
+Garrett LeSage <garrett@novell.com>
+Jakub Steiner <jimmac@novell.com>"
+}
diff --git a/examples/webenginewidgets/cookiebrowser/view-refresh.png b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
index cab4d02c7..cab4d02c7 100644
--- a/examples/webenginewidgets/cookiebrowser/view-refresh.png
+++ b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
diff --git a/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc b/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc
index 8805f2c53..a1cebd6a7 100644
--- a/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc
+++ b/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>view-refresh.png</file>
+        <file alias="view-refresh.png">3rdparty/view-refresh.png</file>
     </qresource>
 </RCC>
diff --git a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc
index 55ccd33d5..a1b4eeb18 100644
--- a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc
+++ b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc
@@ -38,4 +38,14 @@
     well as delete cookies and add new cookies.
 
     \include examples-run.qdocinc
+
+    \section1 Files and Attributions
+
+    The example uses icons from the Tango Icon Library:
+
+    \table
+    \row
+        \li \l{cookiebrowser-tango}{Tango Icon Library}
+        \li Public Domain
+    \endtable
 */
diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING
new file mode 100644
index 000000000..220881da6
--- /dev/null
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING
@@ -0,0 +1 @@
+The icons in this repository are herefore released into the Public Domain.
diff --git a/examples/webenginewidgets/simplebrowser/data/dialog-error.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png
index cdd95bade..cdd95bade 100644
--- a/examples/webenginewidgets/simplebrowser/data/dialog-error.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png
diff --git a/examples/webenginewidgets/simplebrowser/data/edit-clear.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png
index 5542948bc..5542948bc 100644
--- a/examples/webenginewidgets/simplebrowser/data/edit-clear.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png
diff --git a/examples/webenginewidgets/simplebrowser/data/go-bottom.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png
index bf973fedc..bf973fedc 100644
--- a/examples/webenginewidgets/simplebrowser/data/go-bottom.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png
diff --git a/examples/webenginewidgets/simplebrowser/data/go-next.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png
index a68e2db77..a68e2db77 100644
--- a/examples/webenginewidgets/simplebrowser/data/go-next.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png
diff --git a/examples/webenginewidgets/simplebrowser/data/go-previous.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png
index c37bc0414..c37bc0414 100644
--- a/examples/webenginewidgets/simplebrowser/data/go-previous.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png
diff --git a/examples/webenginewidgets/simplebrowser/data/process-stop.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png
index e7a8d1722..e7a8d1722 100644
--- a/examples/webenginewidgets/simplebrowser/data/process-stop.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png
diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json
new file mode 100644
index 000000000..853adeb20
--- /dev/null
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json
@@ -0,0 +1,24 @@
+{
+    "Id": "simplebrowser-tango",
+    "Name": "Tango Icon Library",
+    "QDocModule": "qtwebengine",
+    "QtUsage": "Used in WebEngine SimpleBrowser example.",
+
+    "QtParts": [ "examples" ],
+    "Description": "Selected icons from the Tango Icon Library",
+    "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
+    "Version": "0.8.90",
+    "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
+    "LicenseId": "DocumentRef-PublicDomain",
+    "License": "Public Domain",
+    "LicenseFile": "COPYING",
+    "Copyright": "Ulisse Perusin <uli.peru@gmail.com>
+Steven Garrity <sgarrity@silverorange.com>
+Lapo Calamandrei <calamandrei@gmail.com>
+Ryan Collier <rcollier@novell.com>
+Rodney Dawes <dobey@novell.com>
+Andreas Nilsson <nisses.mail@home.se>
+Tuomas Kuosmanen <tigert@tigert.com>
+Garrett LeSage <garrett@novell.com>
+Jakub Steiner <jimmac@novell.com>"
+}
diff --git a/examples/webenginewidgets/simplebrowser/data/text-html.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png
index a896697d7..a896697d7 100644
--- a/examples/webenginewidgets/simplebrowser/data/text-html.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png
diff --git a/examples/webenginewidgets/simplebrowser/data/view-refresh.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png
index 606ea9eba..606ea9eba 100644
--- a/examples/webenginewidgets/simplebrowser/data/view-refresh.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png
diff --git a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc
index d81b08a64..eda8e3f3d 100644
--- a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc
+++ b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc
@@ -1,14 +1,16 @@
 <RCC>
     <qresource prefix="/">
         <file>AppLogoColor.png</file>
-        <file>dialog-error.png</file>
-        <file>edit-clear.png</file>
-        <file>go-bottom.png</file>
-        <file>go-next.png</file>
-        <file>go-previous.png</file>
-        <file>process-stop.png</file>
-        <file>text-html.png</file>
-        <file>view-refresh.png</file>
         <file>ninja.png</file>
     </qresource>
+    <qresource prefix="/">
+        <file alias="dialog-error.png">3rdparty/dialog-error.png</file>
+        <file alias="edit-clear.png">3rdparty/edit-clear.png</file>
+        <file alias="go-bottom.png">3rdparty/go-bottom.png</file>
+        <file alias="go-next.png">3rdparty/go-next.png</file>
+        <file alias="go-previous.png">3rdparty/go-previous.png</file>
+        <file alias="process-stop.png">3rdparty/process-stop.png</file>
+        <file alias="text-html.png">3rdparty/text-html.png</file>
+        <file alias="view-refresh.png">3rdparty/view-refresh.png</file>
+    </qresource>
 </RCC>
diff --git a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
index 2231d9667..b0c426232 100644
--- a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
+++ b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
@@ -327,9 +327,13 @@
     finished or when an error occurs. See \c downloadmanagerwidget.cpp for an
     example of how these signals can be handled.
 
-    \section1 Licensing
+    \section1 Files and Attributions
 
-    All icons used in the example, with the exception of \c{AppLogoColor.png},
-    originate from the public domain
-    \l{http://tango.freedesktop.org/Tango_Icon_Library}{Tango Icon Library}.
+    The example uses icons from the Tango Icon Library:
+
+    \table
+    \row
+        \li \l{simplebrowser-tango}{Tango Icon Library}
+        \li Public Domain
+    \endtable
 */
diff --git a/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING b/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING
new file mode 100644
index 000000000..220881da6
--- /dev/null
+++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING
@@ -0,0 +1 @@
+The icons in this repository are herefore released into the Public Domain.
diff --git a/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json b/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json
new file mode 100644
index 000000000..ffca1812b
--- /dev/null
+++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json
@@ -0,0 +1,24 @@
+{
+    "Id": "stylesheetbrowser-tango",
+    "Name": "Tango Icon Library",
+    "QDocModule": "qtwebengine",
+    "QtUsage": "Used in WebEngine StyleSheet Browser example.",
+
+    "QtParts": [ "examples" ],
+    "Description": "Selected icons from the Tango Icon Library",
+    "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
+    "Version": "0.8.90",
+    "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
+    "LicenseId": "DocumentRef-PublicDomain",
+    "License": "Public Domain",
+    "LicenseFile": "COPYING",
+    "Copyright": "Ulisse Perusin <uli.peru@gmail.com>
+Steven Garrity <sgarrity@silverorange.com>
+Lapo Calamandrei <calamandrei@gmail.com>
+Ryan Collier <rcollier@novell.com>
+Rodney Dawes <dobey@novell.com>
+Andreas Nilsson <nisses.mail@home.se>
+Tuomas Kuosmanen <tigert@tigert.com>
+Garrett LeSage <garrett@novell.com>
+Jakub Steiner <jimmac@novell.com>"
+}
diff --git a/examples/webenginewidgets/stylesheetbrowser/view-refresh.png b/examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png
index cab4d02c7..cab4d02c7 100644
--- a/examples/webenginewidgets/stylesheetbrowser/view-refresh.png
+++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png
diff --git a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc
index b4db10836..5b271bafb 100644
--- a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc
+++ b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc
@@ -55,4 +55,14 @@
     \quotefromfile webenginewidgets/stylesheetbrowser/mainwindow.cpp
     \skipto MainWindow::removeStyleSheet
     \printuntil /^\}/
+
+    \section1 Files and Attributions
+
+    The example uses icons from the Tango Icon Library:
+
+    \table
+    \row
+        \li \l{stylesheetbrowser-tango}{Tango Icon Library}
+        \li Public Domain
+    \endtable
 */
diff --git a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc
index 8805f2c53..a1cebd6a7 100644
--- a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc
+++ b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>view-refresh.png</file>
+        <file alias="view-refresh.png">3rdparty/view-refresh.png</file>
     </qresource>
 </RCC>
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index f06679a3b..f0755f9cb 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -60,6 +60,7 @@ contains(QT_ARCH, "arm") {
     !isEmpty(MFLOAT): gn_args += arm_float_abi=\"$$MFLOAT\"
 
     MARCH = $$extractCFlag("-march=.*")
+    !isEmpty(MARCH): gn_args += arm_arch=\"$$MARCH\"
 
     MARMV = $$replace(MARCH, "armv",)
     !isEmpty(MARMV) {
diff --git a/src/core/core_common.pri b/src/core/core_common.pri
index 0c3e69e15..ce0eecce2 100644
--- a/src/core/core_common.pri
+++ b/src/core/core_common.pri
@@ -7,3 +7,6 @@ QT_PRIVATE += quick-private gui-private core-private webenginecoreheaders-privat
 
 qtConfig(webengine-geolocation): QT += positioning
 qtConfig(webengine-webchannel): QT += webchannel
+
+# LTO does not work for Chromium at the moment, so disable it completely for core.
+CONFIG -= ltcg
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index aba23b622..410e13837 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -170,7 +170,7 @@ bool usingSoftwareDynamicGL()
 {
     if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL))
         return true;
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) && !defined(QT_NO_OPENGL)
     HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
     wchar_t path[MAX_PATH];
     DWORD size = GetModuleFileName(handle, path, MAX_PATH);
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index acc5cedb7..ab7aee4cb 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -86,7 +86,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \enum QQuickWebEngineScript::ScriptWorldId
 
-    The world ID defining which isolated world the script is executed in.
+    The world ID defining which isolated world the script is executed in. Besides these predefined
+    IDs custom IDs can be used, but must be integers between \c 0 and \c 256.
 
     \value MainWorld
            The world used by the page's web contents. It can be useful in order to expose custom
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc
index cc826a0d9..87094c266 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/webengineview_lgpl.qdoc
@@ -365,7 +365,7 @@
     \since QtWebEngine 1.3
 
     JavaScript world that the web channel instance used by this view is
-    installed in.
+    installed in. The world must be a number between \c 0 and \c 256.
 */
 
 /*!
diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp
index d5247cde1..d1e996b3a 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/webenginewidgets/api/qwebenginescript.cpp
@@ -224,6 +224,8 @@ quint32 QWebEngineScript::worldId() const
 
 /*!
     Sets the world ID of the isolated world to \a id when running this script.
+
+    Must be between \c 0 and \c 256.
  */
 void QWebEngineScript::setWorldId(quint32 id)
 {
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 3013903c8..f91b71ea1 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -718,9 +718,9 @@
     \since 5.7
 
     Runs the JavaScript code contained in \a scriptSource in the world specified by \a worldId.
-    The world ID values are the same as provided by QWebEngineScript::ScriptWorldId. Using the
-    \e runJavaScript() versions without the world ID is the same as running the script in the
-    \c MainWorld.
+    The world ID values are the same as provided by QWebEngineScript::ScriptWorldId, and between \c 0
+    and \c 256. Using the \e runJavaScript() versions without the world ID is the same as running the
+    script in the \c MainWorld.
 
     When the script has been executed, \a resultCallback is called with the result of the last
     executed statement. \c resultCallback can be any of a function pointer, a functor or a lambda,
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 1499a5f05..7bf1b5c42 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -2348,9 +2348,9 @@ void tst_QWebEngineView::imeJSInputEvents()
 
     // Simply committing text should not trigger any JS composition event.
     QTRY_COMPARE(logLines().count(), 3);
-    QCOMPARE(logLines()[0], "[object InputEvent] beforeinput commit");
-    QCOMPARE(logLines()[1], "[object TextEvent] textInput commit");
-    QCOMPARE(logLines()[2], "[object InputEvent] input commit");
+    QCOMPARE(logLines()[0], QStringLiteral("[object InputEvent] beforeinput commit"));
+    QCOMPARE(logLines()[1], QStringLiteral("[object TextEvent] textInput commit"));
+    QCOMPARE(logLines()[2], QStringLiteral("[object InputEvent] input commit"));
 
     evaluateJavaScriptSync(view.page(), "clear()");
     QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2364,10 +2364,10 @@ void tst_QWebEngineView::imeJSInputEvents()
     }
 
     QTRY_COMPARE(logLines().count(), 4);
-    QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
-    QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
-    QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
-    QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
+    QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
+    QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
+    QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
+    QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
 
     {
         QList<QInputMethodEvent::Attribute> attributes;
@@ -2378,11 +2378,11 @@ void tst_QWebEngineView::imeJSInputEvents()
     }
 
     QTRY_COMPARE(logLines().count(), 9);
-    QCOMPARE(logLines()[4], "[object InputEvent] beforeinput commit");
-    QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate commit");
-    QCOMPARE(logLines()[6], "[object TextEvent] textInput commit");
-    QCOMPARE(logLines()[7], "[object InputEvent] input commit");
-    QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend commit");
+    QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput commit"));
+    QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate commit"));
+    QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput commit"));
+    QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input commit"));
+    QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend commit"));
 
     evaluateJavaScriptSync(view.page(), "clear()");
     QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2396,10 +2396,10 @@ void tst_QWebEngineView::imeJSInputEvents()
     }
 
     QTRY_COMPARE(logLines().count(), 4);
-    QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
-    QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
-    QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
-    QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
+    QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
+    QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
+    QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
+    QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
 
     {
         QList<QInputMethodEvent::Attribute> attributes;
@@ -2409,11 +2409,11 @@ void tst_QWebEngineView::imeJSInputEvents()
     }
 
     QTRY_COMPARE(logLines().count(), 9);
-    QCOMPARE(logLines()[4], "[object InputEvent] beforeinput ");
-    QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate ");
-    QCOMPARE(logLines()[6], "[object TextEvent] textInput ");
-    QCOMPARE(logLines()[7], "[object InputEvent] input null");
-    QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend ");
+    QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput "));
+    QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate "));
+    QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput "));
+    QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input null"));
+    QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend "));
 
     evaluateJavaScriptSync(view.page(), "clear()");
     QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
diff --git a/tests/quicktestbrowser/resources.qrc b/tests/quicktestbrowser/resources.qrc
index b1652852b..63ff051de 100644
--- a/tests/quicktestbrowser/resources.qrc
+++ b/tests/quicktestbrowser/resources.qrc
@@ -11,9 +11,9 @@
     </qresource>
     <qresource prefix="icons">
         <!-- To the risk of this breaking more often, do not duplicate the resources since this application won't be deployed -->
-        <file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/go-next.png</file>
-        <file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/go-previous.png</file>
-        <file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/process-stop.png</file>
-        <file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/view-refresh.png</file>
+        <file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png</file>
+        <file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png</file>
+        <file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png</file>
+        <file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png</file>
     </qresource>
 </RCC>