Merge branch '5.6' into dev

Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0

3 files changed, 3 insertions, 37 deletions

diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index 136fef9d2..06912ce92 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -194,38 +194,6 @@ void QWebEngineCookieStorePrivate::onCookieChanged(const QNetworkCookie &cookie,
 */
 
 /*!
-    \class QWebEngineCookieStore::FilterRequest
-    \inmodule QtWebEngineCore
-    \since 5.6
-    \brief The FilterRequest class specifies the properties of a cookie.
-
-    The class specifies the properties of a cookie and determines whether the cookie should be
-    accepted. The class is used as an argument to a filter installed via setCookieFilter().
-*/
-
-/*!
-    \variable QWebEngineCookieStore::FilterRequest::accepted
-    \brief Whether the cookie shall be accepted.
-
-    The default is \c true.
-*/
-
-/*!
-    \variable QWebEngineCookieStore::FilterRequest::firstPartyUrl
-    \brief The URL of the page that triggered the setting of the cookie.
-*/
-
-/*!
-    \variable QWebEngineCookieStore::FilterRequest::cookieLine
-    \brief The content of the cookie.
-*/
-
-/*!
-    \variable QWebEngineCookieStore::FilterRequest::cookieSource
-    \brief The URL of the site that sets the cookie.
-*/
-
-/*!
     \fn void QWebEngineCookieStore::cookieAdded(const QNetworkCookie &cookie)
 
     This signal is emitted whenever a new \a cookie is added to the cookie store.
diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index c286cb709..7325b131e 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -104,13 +104,11 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::OtherNavigation, Q
 */
 
 /*!
-    \fn bool QWebEngineUrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info)
+    \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.
-    If this function is only used for inspection, it should return \c false, in which
-    case any modification to \a info will be ignored.
 
     \sa QWebEngineProfile::setRequestInterceptor
 */
diff --git a/src/core/api/qwebengineurlrequestjob.h b/src/core/api/qwebengineurlrequestjob.h
index 8801e6bc0..afa542d7e 100644
--- a/src/core/api/qwebengineurlrequestjob.h
+++ b/src/core/api/qwebengineurlrequestjob.h
@@ -47,8 +47,8 @@
 #include <QtCore/qurl.h>
 
 namespace QtWebEngineCore {
-class URLRequestCustomJob;
 class URLRequestCustomJobDelegate;
+class URLRequestCustomJobShared;
 } // namespace
 
 QT_BEGIN_NAMESPACE
@@ -79,7 +79,7 @@ public:
 
 private:
     QWebEngineUrlRequestJob(QtWebEngineCore::URLRequestCustomJobDelegate *);
-    friend class QtWebEngineCore::URLRequestCustomJob;
+    friend class QtWebEngineCore::URLRequestCustomJobShared;
 
     QtWebEngineCore::URLRequestCustomJobDelegate* d_ptr;
 };