Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/3rdparty
	src/core/browser_context_adapter.cpp
	src/core/web_contents_adapter.cpp
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf

3 files changed, 3 insertions, 3 deletions

diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h
index 3b7b5e89b..5001ba3a1 100644
--- a/src/core/api/qwebenginecookiestore.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -73,7 +73,7 @@ Q_SIGNALS:
     void cookieRemoved(const QNetworkCookie &cookie);
 
 private:
-    explicit QWebEngineCookieStore(QObject *parent = 0);
+    explicit QWebEngineCookieStore(QObject *parent = Q_NULLPTR);
     friend class QtWebEngineCore::BrowserContextAdapter;
     friend class QtWebEngineCore::CookieMonsterDelegateQt;
     Q_DISABLE_COPY(QWebEngineCookieStore)
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index fb5861c7d..6e0f93e49 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -55,7 +55,7 @@ class QWEBENGINE_EXPORT QWebEngineUrlRequestInterceptor : public QObject
     Q_OBJECT
     Q_DISABLE_COPY(QWebEngineUrlRequestInterceptor)
 public:
-    explicit QWebEngineUrlRequestInterceptor(QObject *p = 0)
+    explicit QWebEngineUrlRequestInterceptor(QObject *p = Q_NULLPTR)
         : QObject (p)
     {
     }
diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h
index 5075af6d5..757c461f4 100644
--- a/src/core/api/qwebengineurlschemehandler.h
+++ b/src/core/api/qwebengineurlschemehandler.h
@@ -55,7 +55,7 @@ class QWebEngineUrlRequestJob;
 class QWEBENGINE_EXPORT QWebEngineUrlSchemeHandler : public QObject {
     Q_OBJECT
 public:
-    QWebEngineUrlSchemeHandler(QObject *parent = 0);
+    QWebEngineUrlSchemeHandler(QObject *parent = Q_NULLPTR);
     ~QWebEngineUrlSchemeHandler();
 
     virtual void requestStarted(QWebEngineUrlRequestJob*) = 0;