Merge branch '5.6' into 5.7

Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94

2 files changed, 19 insertions, 0 deletions

diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index a5796c796..73d3e34b9 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -318,6 +318,7 @@ bool QQuickWebEngineSettings::touchIconsEnabled() const
 
 /*!
     \qmlproperty QString WebEngineSettings::defaultTextEncoding
+    \since QtWebEngine 1.2
 
     Sets the default encoding. The value must be a string describing an encoding such as "utf-8" or
     "iso-8859-1".
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 18c1f462d..eae16c5e5 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -157,6 +157,24 @@
     a QWebEngineCookieStore for accessing the HTTP cookies of Chromium. A QWebEnginePage can also
     directly point to a script collection.
 
+    For a widget based application, the web engine is automatically initialized, unless it is
+    placed in a plugin. In that case, it must be initialized in the application main source file
+    by using \l QtWebEngine::initialize, as illustrated by the following code snippet:
+
+    \code
+    int main(int argc, char **argv)
+    {
+        QApplication app(argc, argv);
+
+        QtWebEngine::initialize();
+
+        QMainWindow window;
+        window.show();
+
+        return app.exec();
+    }
+    \endcode
+
     \section1 Embedding Web Content into Qt Quick Applications
 
     The WebEngineView QML type allows Qt Quick applications to render regions of dynamic web