diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-03-21 14:11:50 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 16:43:52 +0200 |
commit | 3f69bf43c45e54789ce6cdc4a2f01ea129e6287c (patch) | |
tree | a371f31bdd9ab74f44bba3c2d41382b22877c583 /src/webenginewidgets/api/qwebenginehistory_p.h | |
parent | 484f2d8c92e57cbe2c581a65a2ccf461eb68c883 (diff) |
Do not store a WebContentsAdapter directly in QWebEngineHistory
The adapter might change, while the page association should
always remain.
Change-Id: Ib2b49c599d497864484dd6758f47473d70fe4cb3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginehistory_p.h')
-rw-r--r-- | src/webenginewidgets/api/qwebenginehistory_p.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/webenginewidgets/api/qwebenginehistory_p.h b/src/webenginewidgets/api/qwebenginehistory_p.h index 42f3ff73c..fd15f103f 100644 --- a/src/webenginewidgets/api/qwebenginehistory_p.h +++ b/src/webenginewidgets/api/qwebenginehistory_p.h @@ -44,27 +44,26 @@ #include <QtCore/qshareddata.h> -class WebContentsAdapter; - QT_BEGIN_NAMESPACE +class QWebEnginePagePrivate; class QWebEngineHistoryItemPrivate : public QSharedData { public: - QWebEngineHistoryItemPrivate(WebContentsAdapter *adapter = 0, int index = 0); + QWebEngineHistoryItemPrivate(QWebEnginePagePrivate *page = 0, int index = 0); - WebContentsAdapter *adapter; + QWebEnginePagePrivate *page; int index; }; class QWebEngineHistoryPrivate { public: - QWebEngineHistoryPrivate(WebContentsAdapter *adapter); + QWebEngineHistoryPrivate(QWebEnginePagePrivate *page); ~QWebEngineHistoryPrivate(); void updateItems() const; - WebContentsAdapter *adapter; + QWebEnginePagePrivate *page; mutable QList<QWebEngineHistoryItem> items; }; |