diff options
author | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2019-08-06 15:50:22 +0200 |
---|---|---|
committer | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2020-03-18 17:29:24 +0100 |
commit | 31f5c21ddb571d744efd1885c0687816b3a12225 (patch) | |
tree | 1e7ccb81c2db278ed265638eb25a69c546430575 /src/quicktemplates2/qquickcombobox.cpp | |
parent | fccd63d1296a611a282ae15d0c437eb4b09e6eb1 (diff) |
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>
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index f8b91b4e..afce8163 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -267,6 +267,8 @@ public: static void hideOldPopup(QQuickPopup *popup); + QPalette defaultPalette() const override { return QQuickTheme::palette(QQuickTheme::ComboBox); } + bool flat = false; bool down = false; bool hasDown = false; @@ -1942,11 +1944,6 @@ QFont QQuickComboBox::defaultFont() const return QQuickTheme::font(QQuickTheme::ComboBox); } -QPalette QQuickComboBox::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ComboBox); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickComboBox::accessibleRole() const { |