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

Change-Id: Iba6114263488d6bf84b255b38182904dc5880386

3 files changed, 5 insertions, 13 deletions

diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.cpp b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
index d578bf0e3..c1d9a3698 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.cpp
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
@@ -131,10 +131,8 @@ void QWebEngineDownloadItemPrivate::update(const BrowserContextAdapterClient::Do
 
     Q_ASSERT(downloadState != QWebEngineDownloadItem::DownloadRequested);
 
-    if (toDownloadInterruptReason(info.downloadInterruptReason) != interruptReason) {
+    if (toDownloadInterruptReason(info.downloadInterruptReason) != interruptReason)
         interruptReason = toDownloadInterruptReason(info.downloadInterruptReason);
-        Q_EMIT q->interruptReasonChanged();
-    }
 
     if (toDownloadState(info.state) != downloadState) {
         downloadState = toDownloadState(info.state);
@@ -235,15 +233,6 @@ quint32 QWebEngineDownloadItem::id() const
 */
 
 /*!
-    \fn QWebEngineDownloadItem::interruptReasonChanged()
-    \since 5.9
-
-    This signal is emitted whenever the reason of the download's interruption changes.
-
-    \sa interruptReason(), QWebEngineDownloadItem::DownloadInterruptReason
-*/
-
-/*!
     \enum QWebEngineDownloadItem::DownloadState
 
     This enum describes the state of the download:
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.h b/src/webenginewidgets/api/qwebenginedownloaditem.h
index 846194f40..a4b6c08aa 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.h
@@ -134,7 +134,6 @@ Q_SIGNALS:
     void finished();
     void stateChanged(QWebEngineDownloadItem::DownloadState state);
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-    void interruptReasonChanged();
 
 private:
     Q_DISABLE_COPY(QWebEngineDownloadItem)
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index abed066d3..cd4fc8b02 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -156,6 +156,10 @@ QWebEngineProfilePrivate::QWebEngineProfilePrivate(QSharedPointer<BrowserContext
 
 QWebEngineProfilePrivate::~QWebEngineProfilePrivate()
 {
+    // In the case the user sets this profile as the parent of the interceptor
+    // it can be deleted before the browser-context still referencing it is.
+    m_browserContextRef->setRequestInterceptor(nullptr);
+
     delete m_settings;
     m_settings = 0;
     m_browserContextRef->removeClient(this);