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

src/3rdparty used sha1 from 5.9, because both 5.9 and dev are
using same branch now.

Conflicts:
	src/3rdparty
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I16a33e0f91779d1ee3a230070ff4248699c2e1bd

1 files changed, 7 insertions, 1 deletions

diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 8b4fb3823..621982951 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -349,7 +349,7 @@
 */
 
 /*!
-    \fn bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
+    \fn bool QWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
     \since 5.5
     This function is called upon receiving a request to navigate to the specified \a url by means of
     the specified navigation type \a type. \a isMainFrame indicates whether the request corresponds
@@ -365,6 +365,9 @@
     engine process them by overloading this function. This is necessary when an HTML document is
     used as part of the user interface, and not to display external data, for example, when
     displaying a list of results.
+
+    The \l{QWebEngineUrlRequestInterceptor} class offers further options for intercepting and
+    manipulating requests.
 */
 
 /*!
@@ -381,6 +384,9 @@
     \a securityOrigin calls the \c confirm() function with the message \a msg. Returns \c true
     if the user confirms the message; otherwise returns \c false.
 
+    It is also called when the \c onbeforeunload handler is requesting a confirmation before
+    leaving a page.
+
     The default implementation executes the query using QMessageBox::information with QMessageBox::Ok and QMessageBox::Cancel buttons.
 */