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/qquicktabbutton.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/qquicktabbutton.cpp')
-rw-r--r-- | src/quicktemplates2/qquicktabbutton.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp index 0af81278e4..540f1280a5 100644 --- a/src/quicktemplates2/qquicktabbutton.cpp +++ b/src/quicktemplates2/qquicktabbutton.cpp @@ -36,6 +36,7 @@ #include "qquicktabbutton_p.h" #include "qquickcontrol_p_p.h" +#include "qquickabstractbutton_p_p.h" #include <QtGui/qpa/qplatformtheme.h> @@ -63,8 +64,16 @@ QT_BEGIN_NAMESPACE \sa TabBar, {Customizing TabButton}, {Button Controls}, {Navigation Controls} */ +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabButtonPrivate : public QQuickAbstractButtonPrivate +{ + Q_DECLARE_PUBLIC(QQuickTabButton) + +public: + QPalette defaultPalette() const override { return QQuickTheme::palette(QQuickTheme::TabBar); } +}; + QQuickTabButton::QQuickTabButton(QQuickItem *parent) - : QQuickAbstractButton(parent) + : QQuickAbstractButton(*(new QQuickTabButtonPrivate), parent) { setCheckable(true); setAutoExclusive(true); @@ -75,11 +84,6 @@ QFont QQuickTabButton::defaultFont() const return QQuickTheme::font(QQuickTheme::TabBar); } -QPalette QQuickTabButton::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::TabBar); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickTabButton::accessibleRole() const { |