diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2020-12-18 20:02:02 +0100 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-04 18:41:46 +0200 |
| commit | 742b9db0e34c8fc08e9f50c3053aed5f501f08d2 (patch) | |
| tree | 81265ca9b3bee9f78389b8855c7cf565769e15ce /src/webenginequick/api/qquickwebengineview.cpp | |
| parent | 881339e9d9054c46f2621119246de7a13c83761a (diff) | |
Merge WebEngineHistory's quick implementation into QWebEngineHistory
[ChangeLog][QWebEngineCore][QWebEngineHistory] New methods to access
navigation history as a model through new class QWebEngineHistoryModel.
[ChangeLog][QWebEngineQuick] QQuickWebEngineHistory is merged into QWebEngineHistory.
Task-number: QTBUG-74585
Change-Id: I9f9a73bbaf3954282dfc220cfc2c4cb08a37fb73
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginequick/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 2e6a2f428..1d65ad3ac 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -48,7 +48,6 @@ #include "qquickwebengineaction_p.h" #include "qquickwebengineaction_p_p.h" -#include "qquickwebenginehistory_p.h" #include "qquickwebengineclientcertificateselection_p.h" #include "qquickwebenginedialogrequests_p.h" #include "qquickwebenginefaviconprovider_p_p.h" @@ -63,6 +62,7 @@ #include "qwebenginenewwindowrequest.h" #include "qwebenginequotarequest.h" #include "qwebenginescriptcollection.h" +#include <QtWebEngineCore/private/qwebenginehistory_p.h> #include <QtWebEngineCore/private/qwebenginescriptcollection_p.h> #include "qwebengineregisterprotocolhandlerrequest.h" #if QT_CONFIG(webenginequick_testsupport) @@ -127,7 +127,9 @@ static QLatin1String defaultMimeType("text/html;charset=UTF-8"); QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() : m_profile(nullptr) , adapter(QSharedPointer<WebContentsAdapter>::create()) - , m_history(new QQuickWebEngineHistory(this)) + , m_history(new QWebEngineHistory(new QWebEngineHistoryPrivate(this, [] (const QUrl &url) { + return QQuickWebEngineFaviconProvider::faviconProviderUrl(url); + }))) #if QT_CONFIG(webenginequick_testsupport) , m_testSupport(0) #endif @@ -1521,7 +1523,7 @@ void QQuickWebEngineView::findText(const QString &subString, FindFlags options, d->adapter->findTextHelper()->startFinding(subString, options & FindCaseSensitively, options & FindBackward, callback); } -QQuickWebEngineHistory *QQuickWebEngineView::navigationHistory() const +QWebEngineHistory *QQuickWebEngineView::navigationHistory() const { Q_D(const QQuickWebEngineView); return d->m_history.data(); |