Merge branch '5.6' into 5.7

Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9

1 files changed, 9 insertions, 33 deletions

diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 5a2623669..702d0f1df 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -40,19 +40,9 @@
     \l QtWebEngine::initialize in the application main source file, as illustrated by the
     following code snippet:
 
-    \code
-    int main(int argc, char **argv)
-    {
-        Application app(argc, argv);
-
-        QtWebEngine::initialize();
-
-        QQmlApplicationEngine appEngine;
-        appEngine.load(QUrl("qrc:/main.qml"));
-
-        return app.exec();
-    }
-    \endcode
+    \quotefromfile webengine/minimal/main.cpp
+    \skipto main
+    \printuntil }
 
     \section2 Loading Web Pages
 
@@ -62,30 +52,16 @@
 
     The following sample QML application loads a web page using the \c url property:
 
-    \qml
-    import QtQuick 2.1
-    import QtQuick.Controls 1.1
-    import QtWebEngine 1.1
-
-    ApplicationWindow {
-        width: 1280
-        height: 720
-        visible: true
-        WebEngineView {
-            id: webview
-            url: "http://www.qt.io"
-            anchors.fill: parent
-        }
-    }
-    \endqml
+    \quotefromfile webengine/minimal/main.qml
+    \skipto import
+    \printuntil /^\}/
 
-    The \l loadingChanged() signal is emitted when loading a page begins, ends, or fails. The
-    \l loading property holds whether the HTML page is currently loading and the load status is
-    reflected in the \l LoadStatus property.
+    The \l loading property holds whether an HTML page is currently loading.
+    The \l loadingChanged() signal is emitted when loading the page begins, ends, or fails.
 
     The title of an HTML page can be accessed with the \l title property. Additionally, a web
     page may specify an icon, which can be accessed using the \l icon property. The \l zoomFactor
-    property holds the overall size of the contents of the web page.
+    property enables zooming the contents of the web page by a scale factor.
 
     If a certificate error is raised while loading a web page, the \l certificateError() signal is
     emitted. Certificate errors are handled by using the methods of the WebEngineCertificateError