Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/3rdparty
	src/webengine/api/qquickwebenginecertificateerror.cpp
	src/webengine/doc/src/webengineview.qdoc
	tools/qmake/config.tests/libcap/libcap.cpp

Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db

1 files changed, 25 insertions, 0 deletions

diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index f34b4514b..6b5ccaa14 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -203,6 +203,31 @@
     If a proxy requires authentication, QWebEnginePage::proxyAuthenticationRequired is emitted.
     For Qt Quick, a dialog is shown.
 
+    \section1 High DPI Support
+
+    To support High DPI devices, it is recommended that the application attribute
+    Qt::AA_EnableHighDpiScaling is set to enable automatic scaling based on the
+    pixel density of the monitor. In Qt WebEngine applications, the scaling
+    affects the default zooming factor and scrollbar size.
+
+    For example:
+
+    \code
+    int main(int argc, char *argv[])
+    {
+      QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+      QApplication app(argc, argv);
+      // ...
+    }
+    \endcode
+
+    Qt WebEngine bundles images for normal and high-dpi resolutions into
+    \e qtwebengine_resources_100p.pak and \e qtwebengine_resources_200p.pak
+    files. Depending on the target resolutions, one or both of these files need
+    to be deployed.
+
+    For more information, see \l{High DPI Displays}.
+
     \section1 Using WebEngine Core
 
     Qt WebEngine Core provides an API shared by Qt WebEngine and Qt WebEngine Widgets for handling