From 6677ddec16488f21c5f730f4a4005c66d11d81e1 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Fri, 6 Nov 2015 05:33:47 -0800
Subject: 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>
---
 src/core/web_engine_settings.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/core/web_engine_settings.h')

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;
 };
-- 
cgit v1.2.3