diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-16 12:26:34 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-16 14:50:14 +0000 |
| commit | c69c1f32b0b42adb670c08653282a86cc411b239 (patch) | |
| tree | 8c59961682c60c76e1806200ee541958f16e92e1 /src/quicktemplates2/qquickmenuitem_p.h | |
| parent | 0edce6c41e9b193c7482334e313c4886c94702f1 (diff) | |
Restore AbstractButton::checkable
In 7a8f055, we hid the checkable property from QQuickAbstractButton and
exposed it only in QQuickButton and QQuickMenuItem. The reasoning was
that QQuickCheckBox, QQuickRadioButton, QQuickSwitch and their delegate
counterparts are inherently checkable, so having the checkable property
available in QML didn't seem to make sense.
While this still holds true, there are other factors to take into
consideration. AbstractButton is meant to be a generic base class for
all types of buttons, but the lack of a checkable property makes it
unusable as a base class for custom QML-based checkable buttons.
If we want to a hide the checkable property from CheckBox, RadioButton,
and Switch to avoid having it popup in the auto-completion list, we can
probably do it in a less disruptive way via tooling.
[ChangeLog][Controls][AbstractButton] The checkable property has been
made accessible from QML. Previously it was only exposed for Button and
MenuItem, but it is now available for any AbstractButton to make it
possible to create custom QML-based checkable buttons.
Task-number: QTBUG-51554
Change-Id: I19e29fc87cd15811c43c9b9ebb29701d66cde72f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenuitem_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenuitem_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickmenuitem_p.h b/src/quicktemplates2/qquickmenuitem_p.h index 6c717e13..258a096f 100644 --- a/src/quicktemplates2/qquickmenuitem_p.h +++ b/src/quicktemplates2/qquickmenuitem_p.h @@ -57,7 +57,6 @@ class QQuickMenuItemPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuItem : public QQuickAbstractButton { Q_OBJECT - Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL) Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL) public: @@ -67,12 +66,10 @@ public: void setHighlighted(bool highlighted); Q_SIGNALS: - void checkableChanged(); void triggered(); void highlightedChanged(); protected: - void checkableChange() override; QFont defaultFont() const override; #ifndef QT_NO_ACCESSIBILITY |