diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:01:37 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:04:42 +0100 |
commit | 1f474fcc4cd47a85ce8d99f07d18b46ef2af5898 (patch) | |
tree | d4e52b5ac98343b4c2417d622164bf320d781a59 /src/core/web_engine_settings.h | |
parent | 4cc28c7c89f794d469f5e8f778ff05effe8c646f (diff) | |
parent | 1173d48149a8133b607894b67e1ec32de68e21e8 (diff) |
Merge branch '5.6' into dev
Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
Diffstat (limited to 'src/core/web_engine_settings.h')
-rw-r--r-- | src/core/web_engine_settings.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h index d850bd1ef..4104ec67c 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -137,6 +137,10 @@ private: WebEngineSettings *parentSettings; QSet<WebEngineSettings *> childSettings; + static QHash<Attribute, bool> m_defaultAttributes; + static QHash<FontFamily, QString> m_defaultFontFamilies; + static QHash<FontSize, int> m_defaultFontSizes; + friend class BatchTimer; friend class WebContentsAdapter; }; |