diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-10 14:25:29 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-18 08:37:57 +0000 |
| commit | 626977958873752c264604d93cc3564f46aab731 (patch) | |
| tree | 3f84d95c1578b222348a28122017ba977911df40 /src/quicktemplates2/qquickaction_p.h | |
| parent | 9976eec9ef53f5f987d778820cb9b64fe7cec290 (diff) | |
QQuickAction: keep track whether explicitly enabled
An enabled ActionGroup enables all its actions, except those explicitly
disabled.
Change-Id: I917dbb1d382bbb2e254a20933b13af8adfe8faa4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickaction_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickaction_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickaction_p.h b/src/quicktemplates2/qquickaction_p.h index 3f16b4e7..d47b847e 100644 --- a/src/quicktemplates2/qquickaction_p.h +++ b/src/quicktemplates2/qquickaction_p.h @@ -63,7 +63,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAction : public QObject Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL) Q_PROPERTY(QQuickIcon *icon READ icon CONSTANT FINAL) - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) + Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged RESET resetEnabled FINAL) Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL) Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL) Q_PRIVATE_PROPERTY(QQuickAction::d_func(), QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged FINAL) @@ -79,6 +79,7 @@ public: bool isEnabled() const; void setEnabled(bool enabled); + void resetEnabled(); bool isChecked() const; void setChecked(bool checked); |