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

Change-Id: Ic739ab9db0851cc13467168840ea2549996432f8

1 files changed, 8 insertions, 3 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index e4b10faa6..10b4452fb 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -297,9 +297,14 @@ void QWebEnginePagePrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> ne
     if (newPage->d_func() == this) {
         // If createWindow returns /this/ we must delay the adoption.
         Q_ASSERT(q == newPage);
-        QTimer::singleShot(0, q, [this, newPage, newWebContents, initialGeometry] () {
-            adoptNewWindowImpl(newPage, newWebContents, initialGeometry);
-        });
+        // WebContents might be null if we just opened a new page for navigation, in that case
+        // avoid referencing newWebContents so that it is deleted and WebContentsDelegateQt::OpenURLFromTab
+        // will fall back to navigating current page.
+        if (newWebContents->webContents()) {
+            QTimer::singleShot(0, q, [this, newPage, newWebContents, initialGeometry] () {
+                adoptNewWindowImpl(newPage, newWebContents, initialGeometry);
+            });
+        }
     } else {
         adoptNewWindowImpl(newPage, newWebContents, initialGeometry);
     }