diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-06 17:45:07 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-20 18:15:21 +0200 |
commit | 68f3331b98d4d9996732117549cbdf4ea80cac70 (patch) | |
tree | 1a43dcad4e6f9f96852e113413cba065f9fd283b /examples/widgets/browser/history.cpp | |
parent | ccfeac7d1e474408e2cae169714326f6198eb17c (diff) | |
download | qtwebengine-68f3331b98d4d9996732117549cbdf4ea80cac70.tar.gz |
demo browser: Fix the compilation with QtWebEngine.
This makes the demo compile, but not link since
most of the methods aren't implemented yet.
Also disable downloads and printing since they require a bit
more work to instead use the page directly.
Change-Id: I59adfe07fda077c6909f70f12800a4cfa6a6dad2
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'examples/widgets/browser/history.cpp')
-rw-r--r-- | examples/widgets/browser/history.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/browser/history.cpp b/examples/widgets/browser/history.cpp index d5b245e34..5a355707e 100644 --- a/examples/widgets/browser/history.cpp +++ b/examples/widgets/browser/history.cpp @@ -59,15 +59,15 @@ #include <QtWidgets/QHeaderView> #include <QtWidgets/QStyle> -#include <QWebHistoryInterface> -#include <QWebSettings> +#include <QWebEngineHistoryInterface> +#include <QWebEngineSettings> #include <QtCore/QDebug> static const unsigned int HISTORY_VERSION = 23; HistoryManager::HistoryManager(QObject *parent) - : QWebHistoryInterface(parent) + : QWebEngineHistoryInterface(parent) , m_saveTimer(new AutoSaver(this)) , m_historyLimit(30) , m_historyModel(0) @@ -87,8 +87,8 @@ HistoryManager::HistoryManager(QObject *parent) m_historyFilterModel = new HistoryFilterModel(m_historyModel, this); m_historyTreeModel = new HistoryTreeModel(m_historyFilterModel, this); - // QWebHistoryInterface will delete the history manager - QWebHistoryInterface::setDefaultInterface(this); + // QWebEngineHistoryInterface will delete the history manager + QWebEngineHistoryInterface::setDefaultInterface(this); } HistoryManager::~HistoryManager() @@ -180,8 +180,8 @@ void HistoryManager::checkForExpired() void HistoryManager::addHistoryItem(const HistoryItem &item) { - QWebSettings *globalSettings = QWebSettings::globalSettings(); - if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) + QWebEngineSettings *globalSettings = QWebEngineSettings::globalSettings(); + if (globalSettings->testAttribute(QWebEngineSettings::PrivateBrowsingEnabled)) return; m_history.prepend(item); |