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/qquicklabel_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/qquicklabel_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicklabel_p.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/quicktemplates2/qquicklabel_p.h b/src/quicktemplates2/qquicklabel_p.h index 89c9c77b..e7d39071 100644 --- a/src/quicktemplates2/qquicklabel_p.h +++ b/src/quicktemplates2/qquicklabel_p.h @@ -61,8 +61,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickLabel : public QQuickText Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged 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 implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION 5) Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION 5) @@ -82,11 +80,6 @@ public: QQuickItem *background() const; void setBackground(QQuickItem *background); - // 2.3 (Qt 5.10) - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - // 2.5 (Qt 5.12) qreal implicitBackgroundWidth() const; qreal implicitBackgroundHeight() const; @@ -110,8 +103,6 @@ public: Q_SIGNALS: void fontChanged(); void backgroundChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void paletteChanged(); // 2.5 (Qt 5.12) Q_REVISION(5) void implicitBackgroundWidthChanged(); Q_REVISION(5) void implicitBackgroundHeightChanged(); |