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

7 files changed, 18 insertions, 15 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;
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 0eaa7cbd0..fab4827a0 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -39,7 +39,8 @@
     and findText().
 
     A page can be loaded using load() or setUrl(). Alternatively, if you have
-    the HTML content readily available, you can use setHtml().
+    the HTML content readily available, you can use setHtml(). The GET method is
+    always used to load URLs.
 
     The QWebEnginePage class also offers methods to retrieve both the URL currently
     loaded by the page (see url()) as well as the URL originally requested
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index feaa802d7..5a4c1b52b 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -37,8 +37,10 @@
     It can be used in various applications to display web content live from the
     Internet.
 
-    A \e {web site} can be loaded to a web view with the load() function. Like all
-    Qt widgets, the show() function must be invoked in order to display
+    A \e {web site} can be loaded to a web view with the load() function. The
+    GET method is always used to load URLs.
+
+    Like all Qt widgets, the show() function must be invoked in order to display
     the web view. The snippet below illustrates this:
 
     \snippet simple/main.cpp Using QWebEngineView