diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-19 18:26:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 11:41:59 +0100 |
| commit | a520feabeb9d44bbd97b3491402852f238af90e8 (patch) | |
| tree | 379f310c810faec429abe09762da9deba435a477 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | c3e3e41ad2492bd94f6856f73f28f3d09326aa50 (diff) | |
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>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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); |