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

Conflicts:
	src/webengine/api/qquickwebenginesettings.cpp

Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f

1 files changed, 4 insertions, 2 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 5087199cc..31a258b0c 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -797,8 +797,10 @@ void QQuickWebEngineViewPrivate::adoptWebContents(WebContentsAdapter *webContent
 
     // This throws away the WebContentsAdapter that has been used until now.
     // All its states, particularly the loading URL, are replaced by the adopted WebContentsAdapter.
-    WebContentsAdapterOwner *adapterOwner = new WebContentsAdapterOwner(adapter->sharedFromThis());
-    adapterOwner->deleteLater();
+    if (adapter) {
+        WebContentsAdapterOwner *adapterOwner = new WebContentsAdapterOwner(adapter->sharedFromThis());
+        adapterOwner->deleteLater();
+    }
     adapter = webContents->sharedFromThis();
     adapter->initialize(this);