From 68f3331b98d4d9996732117549cbdf4ea80cac70 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 6 Aug 2013 17:45:07 +0200 Subject: 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 --- examples/widgets/browser/browserapplication.cpp | 38 ++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'examples/widgets/browser/browserapplication.cpp') diff --git a/examples/widgets/browser/browserapplication.cpp b/examples/widgets/browser/browserapplication.cpp index 5230e58f9..18b1d0d75 100644 --- a/examples/widgets/browser/browserapplication.cpp +++ b/examples/widgets/browser/browserapplication.cpp @@ -66,7 +66,7 @@ #include #include -#include +#include #include @@ -204,8 +204,8 @@ void BrowserApplication::postLaunch() QString directory = QStandardPaths::writableLocation(QStandardPaths::DataLocation); if (directory.isEmpty()) directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName(); - QWebSettings::setIconDatabasePath(directory); - QWebSettings::setOfflineStoragePath(directory); + QWebEngineSettings::setIconDatabasePath(directory); + QWebEngineSettings::setOfflineStoragePath(directory); setWindowIcon(QIcon(QLatin1String(":browser.svg"))); @@ -227,28 +227,28 @@ void BrowserApplication::loadSettings() QSettings settings; settings.beginGroup(QLatin1String("websettings")); - QWebSettings *defaultSettings = QWebSettings::globalSettings(); - QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont); - int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize); + QWebEngineSettings *defaultSettings = QWebEngineSettings::globalSettings(); + QString standardFontFamily = defaultSettings->fontFamily(QWebEngineSettings::StandardFont); + int standardFontSize = defaultSettings->fontSize(QWebEngineSettings::DefaultFontSize); QFont standardFont = QFont(standardFontFamily, standardFontSize); standardFont = qvariant_cast(settings.value(QLatin1String("standardFont"), standardFont)); - defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family()); - defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize()); + defaultSettings->setFontFamily(QWebEngineSettings::StandardFont, standardFont.family()); + defaultSettings->setFontSize(QWebEngineSettings::DefaultFontSize, standardFont.pointSize()); - QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont); - int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize); + QString fixedFontFamily = defaultSettings->fontFamily(QWebEngineSettings::FixedFont); + int fixedFontSize = defaultSettings->fontSize(QWebEngineSettings::DefaultFixedFontSize); QFont fixedFont = QFont(fixedFontFamily, fixedFontSize); fixedFont = qvariant_cast(settings.value(QLatin1String("fixedFont"), fixedFont)); - defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family()); - defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize()); + defaultSettings->setFontFamily(QWebEngineSettings::FixedFont, fixedFont.family()); + defaultSettings->setFontSize(QWebEngineSettings::DefaultFixedFontSize, fixedFont.pointSize()); - defaultSettings->setAttribute(QWebSettings::JavascriptEnabled, settings.value(QLatin1String("enableJavascript"), true).toBool()); - defaultSettings->setAttribute(QWebSettings::PluginsEnabled, settings.value(QLatin1String("enablePlugins"), true).toBool()); + defaultSettings->setAttribute(QWebEngineSettings::JavascriptEnabled, settings.value(QLatin1String("enableJavascript"), true).toBool()); + defaultSettings->setAttribute(QWebEngineSettings::PluginsEnabled, settings.value(QLatin1String("enablePlugins"), true).toBool()); QUrl url = settings.value(QLatin1String("userStyleSheet")).toUrl(); defaultSettings->setUserStyleSheetUrl(url); - defaultSettings->setAttribute(QWebSettings::DnsPrefetchEnabled, true); + defaultSettings->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true); settings.endGroup(); } @@ -272,8 +272,8 @@ void BrowserApplication::clean() void BrowserApplication::saveSession() { - QWebSettings *globalSettings = QWebSettings::globalSettings(); - if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) + QWebEngineSettings *globalSettings = QWebEngineSettings::globalSettings(); + if (globalSettings->testAttribute(QWebEngineSettings::PrivateBrowsingEnabled)) return; clean(); @@ -434,7 +434,7 @@ HistoryManager *BrowserApplication::historyManager() { if (!s_historyManager) { s_historyManager = new HistoryManager(); - QWebHistoryInterface::setDefaultInterface(s_historyManager); + QWebEngineHistoryInterface::setDefaultInterface(s_historyManager); } return s_historyManager; } @@ -449,7 +449,7 @@ BookmarksManager *BrowserApplication::bookmarksManager() QIcon BrowserApplication::icon(const QUrl &url) const { - QIcon icon = QWebSettings::iconForUrl(url); + QIcon icon = QWebEngineSettings::iconForUrl(url); if (!icon.isNull()) return icon.pixmap(16, 16); if (m_defaultIcon.isNull()) -- cgit v1.2.1