diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-09-29 02:10:05 -0700 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-10-07 11:49:21 +0200 |
| commit | 5e572e88efa7ba7c2b9138ec19e606d3e345ac90 (patch) | |
| tree | 9f0e1fde8602cb6b685c97fbc30a06bcbb4b907c /src/core/web_engine_settings.cpp | |
| parent | 363ce7231af21f14017c4c59da9aa90249f36f4e (diff) | |
Fix WebEngineSettings::setDefaultTextEncoding()
Add the missing default_encoding to the web preferences.
Use a 0ms timer instead of the 100ms in order to apply the settings
as soon as possible and avoid waiting mechanisms in the test.
Change-Id: I12f1a6dd68b29c2b287b160eea1ad5a5fb169c14
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
| -rw-r--r-- | src/core/web_engine_settings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 363cd9c6a..03f746f41 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -44,7 +44,7 @@ #include <QTimer> #include <QTouchDevice> -static const int batchTimerTimeout = 100; +static const int batchTimerTimeout = 0; class BatchTimer : public QTimer { Q_OBJECT @@ -290,4 +290,5 @@ void WebEngineSettings::applySettingsToWebPreferences(WebPreferences *prefs) prefs->default_fixed_font_size = fontSize(DefaultFixedFontSize); prefs->minimum_font_size = fontSize(MinimumFontSize); prefs->minimum_logical_font_size = fontSize(MinimumLogicalFontSize); + prefs->default_encoding = defaultTextEncoding().toStdString(); } |