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

Includes sha1 bump of src/3rdparty to head of 58-based.

Change-Id: I37743c3979c1b6fb21f71eab7048e82f7aa5d78b

6 files changed, 89 insertions, 3 deletions

diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf
index ea9c6f21b..7b1bad4e6 100644
--- a/src/webengine/doc/qtwebengine.qdocconf
+++ b/src/webengine/doc/qtwebengine.qdocconf
@@ -42,6 +42,7 @@ depends += qtcore \
            qtgui \
            qtlocation \
            qtnetwork \
+           qtplatformheaders \
            qtprintsupport \
            qtpositioning \
            qtqml \
diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc
index a75c7aaed..6cced588c 100644
--- a/src/webengine/doc/src/external-resources.qdoc
+++ b/src/webengine/doc/src/external-resources.qdoc
@@ -136,3 +136,13 @@
     \externalpage https://http2.akamai.com/demo
     \title Akamai HTTP/2 Demo
 */
+
+/*!
+    \externalpage https://www.chromium.org/developers/design-documents/user-scripts
+    \title User Scripts
+*/
+
+/*!
+    \externalpage https://wiki.greasespot.net/Metadata_Block#.40name
+    \title Metadata Block
+*/
diff --git a/src/webengine/doc/src/qtwebengine-debugging.qdoc b/src/webengine/doc/src/qtwebengine-debugging.qdoc
index e929fabeb..5ff1c6342 100644
--- a/src/webengine/doc/src/qtwebengine-debugging.qdoc
+++ b/src/webengine/doc/src/qtwebengine-debugging.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -71,4 +71,35 @@
 
     For a detailed explanation of the capabilities of developer tools, see the
     \l {Chrome DevTools} page.
+
+    \section1 Using Command-Line Arguments
+
+    You can use the following command-line arguments while debugging to provide
+    input for bug reports:
+
+    \list
+        \li \c {--disable-gpu} disables GPU hardware acceleration. This is
+            useful when diagnosing OpenGL problems.
+        \li \c {--disable-logging} disables console logging, which might be
+            useful for debug builds.
+        \li \c {--enable-logging --log-level=0} enables console logging and sets
+            the logging level to 0, which means that messages of the severity
+            \c info and above are recorded in the log. This is the default for
+            debug builds. Other possible log levels are \c 1 for warnings, \c 2
+            for errors, and \c 3 for fatal errors.
+        \li \c {--no-sandbox} disables the sandbox for the renderer and plugin
+            processes. Keep in mind that disabling the sandbox might present a
+            security risk.
+        \li \c {--single-process} runs the renderer and plugins in the same
+            process as the browser. This is useful for getting stack traces for
+            renderer crashes.
+    \endlist
+
+    Alternatively, the environment variable QTWEBENGINE_CHROMIUM_FLAGS can be
+    set. For example, the following value could be set to disable logging while
+    debugging an application called \e mybrowser:
+
+    \code
+    QTWEBENGINE_CHROMIUM_FLAGS="--disable-logging" mybrowser
+    \endcode
 */
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc
index a5e972023..7850ff35d 100644
--- a/src/webengine/doc/src/qtwebengine-features.qdoc
+++ b/src/webengine/doc/src/qtwebengine-features.qdoc
@@ -45,6 +45,7 @@
         \li \l{Pepper Plugin API}
         \li \l{Print to PDF}
         \li \l{Spellchecker}
+        \li \l{Touch}
         \li \l{View Source}
         \li \l{WebRTC}
     \endlist
@@ -343,6 +344,22 @@
 
     Support for this feature was added in Qt 5.8.0.
 
+    \section1 Touch
+
+    Qt WebEngine supports touch devices for navigating and interacting with web pages.
+
+    Applications can prohibit the use of touch events in the following ways:
+
+    \list
+        \li Passing the flag \c --touch-events=disabled on the command line will disable touch event
+        support in JavaScript API (meaning \c ontouchstart and related handlers will not be present
+        in the \c document.window object). Touch events will still be delivered to web pages.
+
+       \li Installing an event filter object using \l {QObject::installEventFilter} on the WebEngine
+       view focus proxy object, and filtering out all touch events.
+
+    \endlist
+
     \section1 View Source
 
     Qt WebEngine supports viewing the HTML source of a web page.
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index e180b22c0..e9ca573b7 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -181,8 +181,29 @@
     script to run, the injection point, and the world where the script is run. This enables
     accessing the DOM to manipulate it within a world.
 
-    The following \l Greasemonkey attributes are supported since Qt 5.8:
-    \c @exclude, \c @include, \c @name, \c @match, and \c @run-at.
+    Since Qt 5.8, Qt WebEngine supports augmenting a script by using the
+    following \l{Metadata Block}{Greasemonkey-like attributes}:
+
+    \list
+        \li \c {@exclude <regexp>}
+        \li \c {@include <regexp>}
+        \li \c {@match <regexp>}
+        \li \c {@name <free text>}
+        \li \c {@run-at [document-start|document-end|document-idle]}
+    \endlist
+
+    The attributes determine if and when a \l {User Scripts}{user script} is
+    run. They must be placed immediately in the beginning of the script, inside
+    a \c ==UserScript== comment:
+
+    \code
+    // ==UserScript==
+    // @include http://*.qt.io/*
+    // @exclude http://wiki.qt.io/*
+    // ==/UserScript==
+
+    window.alert("Page is from qt.io, but not wiki.qt.io");
+    \endcode
 
     \section1 Managing Certificates
 
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index ec678672c..068d395b6 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -182,4 +182,10 @@
     It can be re-enabled by setting the \c QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY environment
     variable to a non-empty value.
 
+    \section1 Popups in Fullscreen Applications on Windows
+    Because of a limitation in the Windows compositor, applications that show a fullscreen web
+    engine view will not properly display popups or other top-level windows. The reason and
+    workaround for the issue can be found at \l {Fullscreen OpenGL Based Windows} and
+    \l {QWindowsWindowFunctions::setHasBorderInFullScreen}.
+
 */