diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-24 23:27:44 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-25 08:45:21 +0000 |
commit | 2de38813d72ff243459897aea2b2596287e4e1d3 (patch) | |
tree | dd4deccf587019e9986677a549cfacc20d543cc0 /src/quicktemplates2/qquickbutton_p.h | |
parent | bd4f5a04969b2e69a56c9f735e9376e89ef83690 (diff) |
QQuickButton: promote autoRepeat back to QQuickAbstractButton
The original reason why autoRepeat was demoted to QQuickButton was that
some subclasses, such as QQuickCheckBox, did not need this property.
The same was done with the checkable property. It was first demoted,
and then promoted back to QQuickAbstractButton. These can be useful for
building custom AbstractButton-based controls. Now that we want to make
auto-repeat configurable (autoRepeatInterval and autoRepeatDelay), and
the logic has to be in the base class anyway, it makes more sense to
expose all these in the base class instead of doing the property hiding
tricks for all three properties.
[ChangeLog][Controls][AbstractButton] The autoRepeat property was
promoted from Button to AbstractButton.
Change-Id: Ife105da00d7d87a74fc8160ec35762b6f71d3ad9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickbutton_p.h')
-rw-r--r-- | src/quicktemplates2/qquickbutton_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickbutton_p.h b/src/quicktemplates2/qquickbutton_p.h index f1a34b104f..a77db16e29 100644 --- a/src/quicktemplates2/qquickbutton_p.h +++ b/src/quicktemplates2/qquickbutton_p.h @@ -57,7 +57,6 @@ class QQuickButtonPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButton : public QQuickAbstractButton { Q_OBJECT - Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL) Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL) Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL) @@ -71,15 +70,12 @@ public: void setFlat(bool flat); Q_SIGNALS: - void autoRepeatChanged(); void highlightedChanged(); void flatChanged(); protected: QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent); - void buttonChange(ButtonChange change) override; - QFont defaultFont() const override; QPalette defaultPalette() const override; |