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

Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7

3 files changed, 9 insertions, 2 deletions

diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc
index c0b89ba5a..5d7ca45e7 100644
--- a/examples/webengine/minimal/doc/src/minimal.qdoc
+++ b/examples/webengine/minimal/doc/src/minimal.qdoc
@@ -50,8 +50,11 @@
     \skipto #include
     \printto main
 
-    In the main function we first instantiate a QGuiApplication object.
-    We then call \l{QtWebEngine::initialize}, which makes sure that OpenGL
+    In the \c main function we first set the Qt::AA_EnableHighDpiScaling
+    attribute. This lets the web view automatically scale on high-dpi displays.
+    Then we instantiate a QGuiApplication object.
+
+    Next, we call \l{QtWebEngine::initialize}, which makes sure that OpenGL
     contexts can be shared between the main process and the dedicated renderer
     process (\c QtWebEngineProcess). This method needs to be called before
     any OpenGL context is created.
diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp
index cc5a1f61e..099b70707 100644
--- a/examples/webengine/minimal/main.cpp
+++ b/examples/webengine/minimal/main.cpp
@@ -44,7 +44,9 @@
 
 int main(int argc, char *argv[])
 {
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication app(argc, argv);
+
     QtWebEngine::initialize();
 
     QQmlApplicationEngine engine;
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp
index 779648fac..94d6f8519 100644
--- a/examples/webengine/quicknanobrowser/main.cpp
+++ b/examples/webengine/quicknanobrowser/main.cpp
@@ -78,6 +78,8 @@ static QUrl startupUrl()
 
 int main(int argc, char **argv)
 {
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
     Application app(argc, argv);
 
     QtWebEngine::initialize();