Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I1dd136df7004b11e2f38a2ec4e82a6fa81627479

3 files changed, 21 insertions, 15 deletions

diff --git a/src/webenginewidgets/doc/src/qtwebenginewidgets-examples.qdoc b/src/webenginewidgets/doc/src/qtwebenginewidgets-examples.qdoc
index 8accdf062..b6c5cb497 100644
--- a/src/webenginewidgets/doc/src/qtwebenginewidgets-examples.qdoc
+++ b/src/webenginewidgets/doc/src/qtwebenginewidgets-examples.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group webengine-widgetexamples
     \title Qt WebEngine Widgets Examples
-    \brief Examples demonstrating the Qt WebEngine Widgets usage
+    \brief Examples demonstrating the Qt WebEngine Widgets usage.
     \ingroup all-examples
 
     Qt provides an integrated Web browser component based on Chromium, the popular
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 877bf7175..f9ab710d1 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -451,14 +451,14 @@
 
 /*!
     \property QWebEnginePage::hasSelection
-    \brief whether this page contains selected content or not.
+    \brief Whether this page contains selected content or not.
 
     \sa selectionChanged()
 */
 
 /*!
     \property QWebEnginePage::selectedText
-    \brief the text currently selected
+    \brief The text currently selected.
 
     By default, this property contains an empty string.
 
@@ -643,14 +643,20 @@
 
 /*!
     \property QWebEnginePage::title
-    \brief the title of the page as defined by the HTML \c <title> element
+    \brief The title of the page as defined by the HTML \c <title> element.
+
+    If the page has no \c <title> element, then the URL is used instead. For \c
+    file:// URLs only the filename is used and not the full path.
+
+    By default, before any content has been loaded, this property contains an
+    empty string.
 
     \sa titleChanged()
 */
 
 /*!
     \property QWebEnginePage::url
-    \brief the URL of the page currently viewed
+    \brief The URL of the page currently viewed.
 
     Setting this property clears the view and loads the URL.
 
@@ -661,8 +667,8 @@
 
 /*!
     \property QWebEnginePage::requestedUrl
-    \brief the URL that was originally requested to be loaded by the page
-    that is currently viewed
+    \brief The URL that was originally requested to be loaded by the page
+    that is currently viewed.
 
     \note The URL may differ from the one returned by url(), which is the actual
     URL that results from DNS resolution or redirection.
@@ -729,7 +735,7 @@
 
 /*!
     \property QWebEnginePage::zoomFactor
-    \brief the zoom factor for the page content
+    \brief The zoom factor for the page content.
 
     Valid values are within the range from \c{0.25} to \c{5.0}. The default factor is \c{1.0}.
 */
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index 501959ab9..568e7a63a 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -173,16 +173,16 @@
 
 /*!
     \property QWebEngineView::title
-    \brief the title of the web page currently viewed
+    \brief The title of the page as defined by the HTML \c <title> element.
 
-    By default, this property contains an empty string.
+    Equivalent to \l {QWebEnginePage::title()}.
 
     \sa titleChanged()
 */
 
 /*!
     \property QWebEngineView::url
-    \brief the URL of the web page currently viewed
+    \brief The URL of the web page currently viewed.
 
     Setting this property clears the view and loads the URL.
 
@@ -193,7 +193,7 @@
 
 /*!
     \property QWebEngineView::iconUrl
-    \brief the URL of the icon associated with the page currently viewed
+    \brief The URL of the icon associated with the page currently viewed.
 
     By default, this property contains an empty URL.
 
@@ -202,7 +202,7 @@
 
 /*!
     \property QWebEngineView::hasSelection
-    \brief whether this page contains selected content or not.
+    \brief Whether this page contains selected content or not.
 
     By default, this property is \c false.
 
@@ -211,7 +211,7 @@
 
 /*!
     \property QWebEngineView::selectedText
-    \brief the text currently selected
+    \brief The text currently selected.
 
     By default, this property contains an empty string.
 
@@ -238,7 +238,7 @@
 
 /*!
     \property QWebEngineView::zoomFactor
-    \brief the zoom factor for the view
+    \brief The zoom factor for the view.
 
     Valid values are within the range from \c{0.25} to \c{5.0}. The default factor is \c{1.0}.
 */