From 31f5c21ddb571d744efd1885c0687816b3a12225 Mon Sep 17 00:00:00 2001
From: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Date: Tue, 6 Aug 2019 15:50:22 +0200
Subject: Remove old QQuickPalette implementation

The existing implementation was removed in order to reduce massive code
duplication and simplify color resolving process. Unit tests were fixed
accordingly.

See related changes in the qtdeclarative module for the further details.

[ChangeLog][General] the palette API is a part of
QQuickItem now.

Change-Id: Ic94ab4632e626c11d9b26f035e2a8a119c9088ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quicktemplates2/qquickcontrol_p_p.h | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/quicktemplates2/qquickcontrol_p_p.h')

diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index fa06c97f..116e8745 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -145,17 +145,6 @@ public:
     }
     static QFont parentFont(const QQuickItem *item);
 
-    virtual void resolvePalette();
-    void inheritPalette(const QPalette &palette);
-    void updatePalette(const QPalette &palette);
-    static void updatePaletteRecur(QQuickItem *item, const QPalette &palette);
-    inline void setPalette_helper(const QPalette &palette) {
-        if (resolvedPalette.resolve() == palette.resolve() && resolvedPalette == palette)
-            return;
-        updatePalette(palette);
-    }
-    static QPalette parentPalette(const QQuickItem *item);
-
     void updateLocale(const QLocale &l, bool e);
     static void updateLocaleRecur(QQuickItem *item, const QLocale &l);
     static QLocale calcLocale(const QQuickItem *item);
@@ -196,6 +185,8 @@ public:
     void updateImplicitContentHeight();
     void updateImplicitContentSize();
 
+    QPalette defaultPalette() const override;
+
     struct ExtraData {
         bool hasTopPadding = false;
         bool hasLeftPadding = false;
@@ -217,7 +208,6 @@ public:
         qreal rightInset = 0;
         qreal bottomInset = 0;
         QFont requestedFont;
-        QPalette requestedPalette;
     };
     QLazilyAllocated<ExtraData> extra;
 
@@ -241,7 +231,6 @@ public:
     qreal spacing = 0;
     QLocale locale;
     QFont resolvedFont;
-    QPalette resolvedPalette;
     Qt::FocusPolicy focusPolicy = Qt::NoFocus;
     Qt::FocusReason focusReason = Qt::OtherFocusReason;
     QQuickDeferredPointer<QQuickItem> background;
-- 
cgit v1.2.3