Merge remote-tracking branch 'origin/5.6' into devwip/47-based

Change-Id: I0569b04ced3456a1d5d91e02e117963115fcf1b2

1 files changed, 36 insertions, 0 deletions

diff --git a/src/webengine/api/qquickwebenginesingleton.cpp b/src/webengine/api/qquickwebenginesingleton.cpp
index 3f0c8cb65..7ff974eb4 100644
--- a/src/webengine/api/qquickwebenginesingleton.cpp
+++ b/src/webengine/api/qquickwebenginesingleton.cpp
@@ -41,11 +41,47 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmltype WebEngine
+    \instantiates QQuickWebEngineSingleton
+    \inqmlmodule QtWebEngine 1.1
+    \since QtWebEngine 1.1
+    \brief Provides access to the default settings and profiles shared by all web engine views.
+
+    The WebEngine singleton type provides access to the default profile and the default settings
+    shared by all web engine views. It can be used to change settings globally, as illustrated by
+    the following code snippet:
+
+    \code
+    Component.onCompleted: {
+        WebEngine.settings.javaScriptEnabled = true;
+    }
+    \endcode
+*/
+
+/*!
+    \qmlproperty WebEngineSettings WebEngine::settings
+    \readonly
+    \since QtWebEngine 1.1
+
+    Default settings for all web engine views.
+
+    \sa WebEngineSettings
+*/
 QQuickWebEngineSettings *QQuickWebEngineSingleton::settings() const
 {
     return defaultProfile()->settings();
 }
 
+/*!
+    \qmlproperty WebEngineProfile WebEngine::defaultProfile
+    \readonly
+    \since QtWebEngine 1.1
+
+    Default profile for all web engine views.
+
+    \sa WebEngineProfile
+*/
 QQuickWebEngineProfile *QQuickWebEngineSingleton::defaultProfile() const
 {
     return QQuickWebEngineProfile::defaultProfile();