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

Change-Id: I8a281e308ec1a6e93dc9756ba6399ca1b50210d8

5 files changed, 14 insertions, 10 deletions

diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index 877b376b0..c03255a97 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -96,6 +96,9 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::OtherNavigation, Q
     interceptor on the profile enables intercepting, blocking, and modifying URL requests
     before they reach the networking stack of Chromium.
 
+    You can install the interceptor on a profile via QWebEngineProfile::setRequestInterceptor()
+    or QQuickWebEngineProfile::setRequestInterceptor().
+
     \sa interceptRequest(), QWebEngineUrlRequestInfo
 */
 
@@ -108,14 +111,12 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::OtherNavigation, Q
 /*!
     \fn void QWebEngineUrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info)
 
-    Reimplementing this virtual function and setting the interceptor on a profile makes
-    it possible to intercept URL requests. This function is executed on the IO thread,
-    and therefore running long tasks here will block networking.
+    Reimplementing this virtual function makes it possible to intercept URL
+    requests. This function is executed on the IO thread, and therefore running
+    long tasks here will block networking.
 
     \a info contains the information about the URL request and will track internally
     whether its members have been altered.
-
-    \sa QWebEngineProfile::setRequestInterceptor()
 */
 
 
diff --git a/src/core/api/qwebengineurlschemehandler.cpp b/src/core/api/qwebengineurlschemehandler.cpp
index e60d90d04..94b85c42b 100644
--- a/src/core/api/qwebengineurlschemehandler.cpp
+++ b/src/core/api/qwebengineurlschemehandler.cpp
@@ -49,7 +49,8 @@ QT_BEGIN_NAMESPACE
     \since 5.6
 
     To implement a custom URL scheme for QtWebEngine, you must write a class derived from this class,
-    and reimplement requestStarted().
+    and reimplement requestStarted(). Then install it via QWebEngineProfile::installUrlSchemeHandler()
+    or QQuickWebEngineProfile::installUrlSchemeHandler().
 
     \inmodule QtWebEngineCore
 
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
index a0641c9dd..f04b73615 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
@@ -47,7 +47,8 @@ QT_BEGIN_NAMESPACE
     \since 5.4
     \inmodule QtWebEngineWidgets
 
-    Provides information about a certificate error.
+    Provides information about a certificate error. This class is used as a parameter of
+    QWebEnginePage::certificateError().
 */
 
 class QWebEngineCertificateErrorPrivate {
diff --git a/src/webenginewidgets/api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp
index 41de8c90b..48ddbc48e 100644
--- a/src/webenginewidgets/api/qwebenginehistory.cpp
+++ b/src/webenginewidgets/api/qwebenginehistory.cpp
@@ -226,9 +226,7 @@ QWebEngineHistoryItem QWebEngineHistory::backItem() const
 
 QWebEngineHistoryItem QWebEngineHistory::currentItem() const
 {
-    Q_D(const QWebEngineHistory);
-    d->updateItems();
-    return d->items[currentItemIndex()];
+    return itemAt(currentItemIndex());
 }
 
 QWebEngineHistoryItem QWebEngineHistory::forwardItem() const
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index e7ad5b107..14c4d72fe 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -163,6 +163,9 @@ void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient*
 
     QWebEnginePagePrivate *pagePrivate = static_cast<QWebEnginePagePrivate *>(container);
     if (pagePrivate->view) {
+        if (parentWidget())
+            disconnect(parentWidget(), &QObject::destroyed,
+                this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
         pagePrivate->view->layout()->addWidget(this);
         pagePrivate->view->setFocusProxy(this);
         show();