From a520feabeb9d44bbd97b3491402852f238af90e8 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Wed, 19 Feb 2014 18:26:34 +0100
Subject: Fix a crash when using the history on an adopted page

We also need to update the WebContentsAdapter pointer in
QWebEngineHistoryPrivate.

Change-Id: I8251e9834b179747b6b65630cf4ced5c2b1af27f
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/webenginewidgets/api/qwebenginepage.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/webenginewidgets')

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 74b74abf1..3436d86cf 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -248,6 +248,7 @@ void QWebEnginePagePrivate::adoptNewWindow(WebContentsAdapter *newWebContents, W
     // Overwrite the new page's WebContents with ours.
     if (newPage) {
         newPage->d_func()->adapter = newWebContents;
+        newPage->history()->d_func()->adapter = newWebContents;
         newWebContents->initialize(newPage->d_func());
         if (!initialGeometry.isEmpty())
             emit newPage->geometryChangeRequested(initialGeometry);
-- 
cgit v1.2.3