summaryrefslogtreecommitdiff
path: root/examples/webenginewidgets/browser/settings.cpp
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@theqtcompany.com>2015-01-09 11:59:22 +0100
committerPierre Rossi <pierre.rossi@theqtcompany.com>2015-03-20 12:14:52 +0000
commitaaa2ecff7e52a52ccd2e9c9c71a7703222341318 (patch)
tree19bf5f2e01e005517ec82adc48fec8a443b45d7b /examples/webenginewidgets/browser/settings.cpp
parent3ef408a32c352d86fbc1346304e0a6ffbbe12c0b (diff)
downloadqtwebengine-aaa2ecff7e52a52ccd2e9c9c71a7703222341318.tar.gz
Demo browser: re-add user stylesheets
Implemented in terms of user scripts. Considering loading from a file URL would probably require setting a different cross origin policy for the isolated world we run this in, something we don't quite have yet, it seems easier to just use an inline <style> block. Change-Id: Ia6f7fbb96b925bcc3202b510689524abd93643fc Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'examples/webenginewidgets/browser/settings.cpp')
-rw-r--r--examples/webenginewidgets/browser/settings.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/examples/webenginewidgets/browser/settings.cpp b/examples/webenginewidgets/browser/settings.cpp
index 6169f72a3..7ed5f707b 100644
--- a/examples/webenginewidgets/browser/settings.cpp
+++ b/examples/webenginewidgets/browser/settings.cpp
@@ -137,7 +137,7 @@ void SettingsDialog::loadFromSettings()
enableJavascript->setChecked(settings.value(QLatin1String("enableJavascript"), enableJavascript->isChecked()).toBool());
enablePlugins->setChecked(settings.value(QLatin1String("enablePlugins"), enablePlugins->isChecked()).toBool());
- userStyleSheet->setText(settings.value(QLatin1String("userStyleSheet")).toUrl().toString());
+ userStyleSheet->setPlainText(settings.value(QLatin1String("userStyleSheet")).toString());
enableScrollAnimator->setChecked(settings.value(QLatin1String("enableScrollAnimator"), enableScrollAnimator->isChecked()).toBool());
httpUserAgent->setText(settings.value(QLatin1String("httpUserAgent"), httpUserAgent->text()).toString());
settings.endGroup();
@@ -196,11 +196,7 @@ void SettingsDialog::saveToSettings()
settings.setValue(QLatin1String("enableJavascript"), enableJavascript->isChecked());
settings.setValue(QLatin1String("enablePlugins"), enablePlugins->isChecked());
settings.setValue(QLatin1String("enableScrollAnimator"), enableScrollAnimator->isChecked());
- QString userStyleSheetString = userStyleSheet->text();
- if (QFile::exists(userStyleSheetString))
- settings.setValue(QLatin1String("userStyleSheet"), QUrl::fromLocalFile(userStyleSheetString));
- else
- settings.setValue(QLatin1String("userStyleSheet"), QUrl(userStyleSheetString));
+ settings.setValue(QLatin1String("userStyleSheet"), userStyleSheet->toPlainText());
settings.setValue(QLatin1String("httpUserAgent"), httpUserAgent->text());
settings.endGroup();