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/settings.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/settings.cpp')
| -rw-r--r-- | examples/widgets/browser/settings.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/widgets/browser/settings.cpp b/examples/widgets/browser/settings.cpp index 3521ce977..cdd6f04c8 100644 --- a/examples/widgets/browser/settings.cpp +++ b/examples/widgets/browser/settings.cpp @@ -50,7 +50,7 @@ #include <QtCore/QSettings> #include <QtWidgets/QtWidgets> -#include <QtWebKitWidgets> +#include <QtWebEngineWidgets/QtWebEngineWidgets> SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) @@ -68,21 +68,21 @@ SettingsDialog::SettingsDialog(QWidget *parent) void SettingsDialog::loadDefaults() { - 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); standardFont = QFont(standardFontFamily, standardFontSize); standardLabel->setText(QString(QLatin1String("%1 %2")).arg(standardFont.family()).arg(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); fixedFont = QFont(fixedFontFamily, fixedFontSize); fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(fixedFont.family()).arg(fixedFont.pointSize())); downloadsLocation->setText(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)); - enableJavascript->setChecked(defaultSettings->testAttribute(QWebSettings::JavascriptEnabled)); - enablePlugins->setChecked(defaultSettings->testAttribute(QWebSettings::PluginsEnabled)); + enableJavascript->setChecked(defaultSettings->testAttribute(QWebEngineSettings::JavascriptEnabled)); + enablePlugins->setChecked(defaultSettings->testAttribute(QWebEngineSettings::PluginsEnabled)); } void SettingsDialog::loadFromSettings() |