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/qquickcontrol_p.h | |
| 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/qquickcontrol_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h index d35630a7..e0837a0d 100644 --- a/src/quicktemplates2/qquickcontrol_p.h +++ b/src/quicktemplates2/qquickcontrol_p.h @@ -80,8 +80,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControl : public QQuickItem Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset RESET resetBaselineOffset NOTIFY baselineOffsetChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) // 2.5 (Qt 5.12) Q_PROPERTY(qreal horizontalPadding READ horizontalPadding WRITE setHorizontalPadding RESET resetHorizontalPadding NOTIFY horizontalPaddingChanged FINAL REVISION 5) Q_PROPERTY(qreal verticalPadding READ verticalPadding WRITE setVerticalPadding RESET resetVerticalPadding NOTIFY verticalPaddingChanged FINAL REVISION 5) @@ -164,12 +162,7 @@ public: void setBaselineOffset(qreal offset); void resetBaselineOffset(); - // 2.3 (Qt 5.10) - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - - // 2.5 (Qt 5.12) + // 2.5 (Qt 5.12) qreal horizontalPadding() const; void setHorizontalPadding(qreal padding); void resetHorizontalPadding(); @@ -221,8 +214,6 @@ Q_SIGNALS: void backgroundChanged(); void contentItemChanged(); void baselineOffsetChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void paletteChanged(); // 2.5 (Qt 5.12) Q_REVISION(5) void horizontalPaddingChanged(); Q_REVISION(5) void verticalPaddingChanged(); @@ -237,7 +228,6 @@ Q_SIGNALS: protected: virtual QFont defaultFont() const; - virtual QPalette defaultPalette() const; QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent); @@ -276,7 +266,6 @@ protected: virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding); virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem); virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale); - virtual void paletteChange(const QPalette &newPalette, const QPalette &oldPalette); virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset); virtual void enabledChange(); |