diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-11-06 05:33:47 -0800 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-11-12 10:46:55 +0000 |
| commit | 6677ddec16488f21c5f730f4a4005c66d11d81e1 (patch) | |
| tree | 048c51f6dfa789d6c06b04b1c9603b89596d608d /src/core/web_engine_settings.h | |
| parent | c61fa3df0fc3373de79a633da8f9b42d41523b55 (diff) | |
Fix resetting attributes in top level WebEngineSettings
Store default values in separate containers and remove related
FIXMEs from WebEngineSettings.
Add API test case in order to demonstrate the bug.
Change-Id: If9d98265cab0f41b543fe690d534879b65f2b577
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
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 | 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 29ef079b7..3d3d734d0 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -136,6 +136,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; }; |