Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: If16bfc6f0fbfd0040e13a8a3cbaa113fda10f387

5 files changed, 85 insertions, 5 deletions

diff --git a/src/webengine/api/qquickwebenginedialogrequests.cpp b/src/webengine/api/qquickwebenginedialogrequests.cpp
index 641793e12..c57f4c76f 100644
--- a/src/webengine/api/qquickwebenginedialogrequests.cpp
+++ b/src/webengine/api/qquickwebenginedialogrequests.cpp
@@ -312,11 +312,10 @@ QString QQuickWebEngineJavaScriptDialogRequest::message() const
 }
 
 /*!
-    \qmlproperty string JavaScriptDialogRequest::defaultPrompt
+    \qmlproperty string JavaScriptDialogRequest::defaultText
     \readonly
 
-    The default text if the requested dialog box is of
-    the \l type PromptDialog.
+    The default prompt text, if the requested dialog is a prompt.
 */
 
 
@@ -811,7 +810,7 @@ QString QQuickWebEngineFormValidationMessageRequest::subText() const
 }
 
 /*!
-    \qmlproperty enumeration ValidationMessageRequest::type
+    \qmlproperty enumeration FormValidationMessageRequest::type
     \readonly
 
     The type of the form validation message request.
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp
index 58116116c..ac320a9e6 100644
--- a/src/webengine/api/qquickwebenginedownloaditem.cpp
+++ b/src/webengine/api/qquickwebenginedownloaditem.cpp
@@ -222,6 +222,8 @@ quint32 QQuickWebEngineDownloadItem::id() const
             Download is in progress.
     \value  WebEngineDownloadItem.DownloadCompleted
             Download completed successfully.
+    \value  WebEngineDownloadItem.DownloadCancelled
+            Download was cancelled by the user.
     \value  WebEngineDownloadItem.DownloadInterrupted
             Download has been interrupted (by the server or because of lost connectivity).
 */
diff --git a/src/webengine/api/qquickwebengineloadrequest.cpp b/src/webengine/api/qquickwebengineloadrequest.cpp
index 47ec17c16..b3422c516 100644
--- a/src/webengine/api/qquickwebengineloadrequest.cpp
+++ b/src/webengine/api/qquickwebengineloadrequest.cpp
@@ -120,6 +120,26 @@ QString QQuickWebEngineLoadRequest::errorString() const
     return d->errorString;
 }
 
+/*!
+    \qmlproperty enumeration WebEngineLoadRequest::errorDomain
+    This enumeration holds the type of a load request error:
+
+    \value  WebEngineView.NoErrorDomain
+            Error type is not known.
+    \value  WebEngineView.InternalErrorDomain
+            Content cannot be interpreted by Qt WebEngine.
+    \value  WebEngineView.ConnectionErrorDomain
+            Error results from a faulty network connection.
+    \value  WebEngineView.CertificateErrorDomain
+            Error is related to the SSL/TLS certificate.
+    \value  WebEngineView.HttpErrorDomain
+            Error is related to the HTTP connection.
+    \value  WebEngineView.FtpErrorDomain
+            Error is related to the FTP connection.
+    \value  WebEngineView.DnsErrorDomain
+            Error is related to the DNS connection.
+*/
+
 QQuickWebEngineView::ErrorDomain QQuickWebEngineLoadRequest::errorDomain() const
 {
     Q_D(const QQuickWebEngineLoadRequest);
diff --git a/src/webengine/api/qquickwebenginenavigationrequest.cpp b/src/webengine/api/qquickwebenginenavigationrequest.cpp
index a738ece80..a6e253561 100644
--- a/src/webengine/api/qquickwebenginenavigationrequest.cpp
+++ b/src/webengine/api/qquickwebenginenavigationrequest.cpp
@@ -63,6 +63,20 @@ public:
     bool isMainFrame;
 };
 
+/*!
+    \qmltype WebEngineNavigationRequest
+    \instantiates QQuickWebEngineNavigationRequest
+    \inqmlmodule QtWebEngine
+    \since QtWebEngine 1.0
+
+    \brief Represents a request for navigating to a web page as part of
+    \l{WebEngineView::navigationRequested()}.
+
+    To accept or reject a request, set \l action to
+    \c WebEngineNavigationRequest.AcceptRequest or
+    \c WebEngineNavigationRequest.IgnoreRequest.
+*/
+
 QQuickWebEngineNavigationRequest::QQuickWebEngineNavigationRequest(const QUrl& url, QQuickWebEngineView::NavigationType navigationType, bool mainFrame, QObject* parent)
     : QObject(parent)
     , d_ptr(new QQuickWebEngineNavigationRequestPrivate(url, navigationType, mainFrame))
@@ -73,6 +87,17 @@ QQuickWebEngineNavigationRequest::~QQuickWebEngineNavigationRequest()
 {
 }
 
+/*!
+    \qmlproperty enumeration WebEngineNavigationRequest::action
+
+    Whether to accept or ignore the navigation request.
+
+    \value  WebEngineNavigationRequest.AcceptRequest
+            Accepts a navigation request.
+    \value  WebEngineNavigationRequest.IgnoreRequest
+            Ignores a navigation request.
+*/
+
 void QQuickWebEngineNavigationRequest::setAction(QQuickWebEngineView::NavigationRequestAction action)
 {
     Q_D(QQuickWebEngineNavigationRequest);
@@ -83,6 +108,13 @@ void QQuickWebEngineNavigationRequest::setAction(QQuickWebEngineView::Navigation
     emit actionChanged();
 }
 
+/*!
+    \qmlproperty url WebEngineNavigationRequest::url
+    \readonly
+
+    The URL of the web page to go to.
+*/
+
 QUrl QQuickWebEngineNavigationRequest::url() const
 {
     Q_D(const QQuickWebEngineNavigationRequest);
@@ -95,12 +127,39 @@ QQuickWebEngineView::NavigationRequestAction QQuickWebEngineNavigationRequest::a
     return d->action;
 }
 
+/*!
+    \qmlproperty enumeration WebEngineNavigationRequest::navigationType
+    \readonly
+
+    The method used to navigate to a web page.
+
+    \value  WebEngineNavigationRequest.LinkClickedNavigation
+            Clicking a link.
+    \value  WebEngineNavigationRequest.TypedNavigation
+            Entering an URL on the address bar.
+    \value  WebEngineNavigationRequest.FormSubmittedNavigation
+            Submitting a form.
+    \value  WebEngineNavigationRequest.BackForwardNavigation
+            Using navigation history to go to the previous or next page.
+    \value  WebEngineNavigationRequest.ReloadNavigation
+            Reloading the page.
+    \value  WebEngineNavigationRequest.OtherNavigation
+            Using some other method to go to a page.
+*/
+
 QQuickWebEngineView::NavigationType QQuickWebEngineNavigationRequest::navigationType() const
 {
     Q_D(const QQuickWebEngineNavigationRequest);
     return d->navigationType;
 }
 
+/*!
+    \qmlproperty bool WebEngineNavigationRequest::isMainFrame
+    \readonly
+
+    Whether the navigation issue is requested for a top level page.
+*/
+
 bool QQuickWebEngineNavigationRequest::isMainFrame() const
 {
     Q_D(const QQuickWebEngineNavigationRequest);
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index ac01d9cd6..8a3c6c24f 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -267,7 +267,7 @@ bool QQuickWebEngineSettings::webGLEnabled() const
     \qmlproperty bool WebEngineSettings::accelerated2dCanvasEnabled
     \since QtWebEngine 1.3
 
-    Specifies whether the HTML 5 2D canvas should be a OpenGL framebuffer.
+    Specifies whether the HTML 5 2D canvas should be an OpenGL framebuffer.
     This makes many painting operations faster, but slows down pixel access.
 
     Enabled by default if available.