diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-12-08 16:26:44 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-12-09 15:10:24 +0000 |
commit | 222faea4af492f3286e9adca9c3d57a0f553a52a (patch) | |
tree | 33cf24d3795a338463a7c2a9919943e49860a65f /src/core/web_engine_settings.h | |
parent | 90d3044e3a6ad58819be6787b5edcbc9daa948dc (diff) |
Fix default settings initialization
We must ensure WebContext is initialized before using global chromium
objects like command_line.
And clean-up the use of static default tables, both fixing their name,
and fix a problem where the default depends on which type of profile
was initialized first.
Change-Id: Ibd8cbbf00bb2ad6cc1d823023d2a48e10bdf93bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_settings.h')
-rw-r--r-- | src/core/web_engine_settings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h index 86f8762cb..e8b268094 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -140,9 +140,9 @@ private: WebEngineSettings *parentSettings; QSet<WebEngineSettings *> childSettings; - static QHash<Attribute, bool> m_defaultAttributes; - static QHash<FontFamily, QString> m_defaultFontFamilies; - static QHash<FontSize, int> m_defaultFontSizes; + static QHash<Attribute, bool> s_defaultAttributes; + static QHash<FontFamily, QString> s_defaultFontFamilies; + static QHash<FontSize, int> s_defaultFontSizes; friend class BatchTimer; friend class WebContentsAdapter; |