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

5 files changed, 12 insertions, 12 deletions

diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.h b/src/webenginewidgets/api/qwebenginedownloaditem.h
index 390a1a598..80b5c06c5 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.h
@@ -99,7 +99,7 @@ private:
 
     friend class QWebEngineProfilePrivate;
 
-    QWebEngineDownloadItem(QWebEngineDownloadItemPrivate*, QObject *parent = 0);
+    QWebEngineDownloadItem(QWebEngineDownloadItemPrivate*, QObject *parent = Q_NULLPTR);
     QScopedPointer<QWebEngineDownloadItemPrivate> d_ptr;
 };
 
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 0c6450d20..2ac8e0f3e 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -188,8 +188,8 @@ public:
         KilledTerminationStatus
     };
 
-    explicit QWebEnginePage(QObject *parent = 0);
-    QWebEnginePage(QWebEngineProfile *profile, QObject *parent = 0);
+    explicit QWebEnginePage(QObject *parent = Q_NULLPTR);
+    QWebEnginePage(QWebEngineProfile *profile, QObject *parent = Q_NULLPTR);
     ~QWebEnginePage();
     QWebEngineHistory *history() const;
 
@@ -208,10 +208,10 @@ public:
 
     virtual bool event(QEvent*);
 #ifdef Q_QDOC
-    void findText(const QString &subString, FindFlags options = 0);
+    void findText(const QString &subString, FindFlags options = FindFlags());
     void findText(const QString &subString, FindFlags options, FunctorOrLambda resultCallback);
 #else
-    void findText(const QString &subString, FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
+    void findText(const QString &subString, FindFlags options = FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 #endif
     QMenu *createStandardContextMenu();
 
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index 22a913fb2..d981fa5bb 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -63,8 +63,8 @@ class QWebEngineUrlSchemeHandler;
 class QWEBENGINEWIDGETS_EXPORT QWebEngineProfile : public QObject {
     Q_OBJECT
 public:
-    explicit QWebEngineProfile(QObject *parent = 0);
-    explicit QWebEngineProfile(const QString &name, QObject *parent = 0);
+    explicit QWebEngineProfile(QObject *parent = Q_NULLPTR);
+    explicit QWebEngineProfile(const QString &name, QObject *parent = Q_NULLPTR);
     virtual ~QWebEngineProfile();
 
     enum HttpCacheType {
@@ -132,7 +132,7 @@ private Q_SLOTS:
 private:
     Q_DISABLE_COPY(QWebEngineProfile)
     Q_DECLARE_PRIVATE(QWebEngineProfile)
-    QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = 0);
+    QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = Q_NULLPTR);
 
     friend class QWebEnginePagePrivate;
     friend class QWebEngineUrlSchemeHandler;
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index 6dc1b539b..0ba728c94 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -114,7 +114,7 @@ private:
     friend class QWebEngineProfilePrivate;
 
     ~QWebEngineSettings();
-    explicit QWebEngineSettings(QWebEngineSettings *parentSettings = 0);
+    explicit QWebEngineSettings(QWebEngineSettings *parentSettings = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index f7e846861..cb66bb75f 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -65,7 +65,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
 
 public:
-    explicit QWebEngineView(QWidget* parent = 0);
+    explicit QWebEngineView(QWidget* parent = Q_NULLPTR);
     virtual ~QWebEngineView();
 
     QWebEnginePage* page() const;
@@ -95,10 +95,10 @@ public:
     void setZoomFactor(qreal factor);
 
 #ifdef Q_QDOC
-    void findText(const QString &subString, QWebEnginePage::FindFlags options = 0);
+    void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags());
     void findText(const QString &subString, QWebEnginePage::FindFlags options, FunctorOrLambda resultCallback);
 #else
-    void findText(const QString &subString, QWebEnginePage::FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
+    void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 #endif
 
     virtual QSize sizeHint() const Q_DECL_OVERRIDE;