1 files changed, 6 insertions, 1 deletions
diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h
index 9cd8cb889d..dd2a25aed3 100644
--- a/src/widgets/styles/qstylesheetstyle_p.h
+++ b/src/widgets/styles/qstylesheetstyle_p.h
@@ -42,6 +42,7 @@
 #include "QtCore/qhash.h"
 #include "QtGui/qevent.h"
 #include "QtCore/qvector.h"
+#include "QtCore/qset.h"
 #include "QtWidgets/qapplication.h"
 #include "private/qcssparser_p.h"
 #include "QtGui/qbrush.h"
@@ -149,6 +150,7 @@ private:
     void unsetPalette(QWidget *);
     void setProperties(QWidget *);
     void setGeometry(QWidget *);
+    void unsetStyleSheetFont(QWidget *) const;
     QVector<QCss::StyleRule> styleRules(const QObject *obj) const;
     bool hasStyleRule(const QObject *obj, int part) const;
 
@@ -178,9 +180,12 @@ public:
     QHash<const QObject *, QHash<int, bool> > hasStyleRuleCache;
     typedef QHash<int, QHash<quint64, QRenderRule> > QRenderRules;
     QHash<const QObject *, QRenderRules> renderRulesCache;
-    QHash<const QWidget *, QPalette> customPaletteWidgets; // widgets whose palette we tampered
     QHash<const void *, QCss::StyleSheet> styleSheetCache; // parsed style sheets
     QSet<const QWidget *> autoFillDisabledWidgets;
+    // widgets whose palettes and fonts we have tampered. stored value pair is
+    // QPair<old widget value, resolve mask of stylesheet value>
+    QHash<const QWidget *, QPair<QPalette, uint> > customPaletteWidgets;
+    QHash<const QWidget *, QPair<QFont, uint> > customFontWidgets;
 };