aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickaction_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-10 14:25:29 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-18 08:37:57 +0000
commit626977958873752c264604d93cc3564f46aab731 (patch)
tree3f84d95c1578b222348a28122017ba977911df40 /src/quicktemplates2/qquickaction_p_p.h
parent9976eec9ef53f5f987d778820cb9b64fe7cec290 (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_p.h')
-rw-r--r--src/quicktemplates2/qquickaction_p_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickaction_p_p.h b/src/quicktemplates2/qquickaction_p_p.h
index 4e1c89c2..754de3d5 100644
--- a/src/quicktemplates2/qquickaction_p_p.h
+++ b/src/quicktemplates2/qquickaction_p_p.h
@@ -74,6 +74,8 @@ public:
QVariant shortcut() const;
void setShortcut(const QVariant &shortcut);
+ void setEnabled(bool enable);
+
bool watchItem(QQuickItem *item);
bool unwatchItem(QQuickItem *item);
@@ -107,6 +109,7 @@ public:
ShortcutEntry *findShortcutEntry(QObject *target) const;
void updateDefaultShortcutEntry();
+ bool explicitEnabled;
bool enabled;
bool checked;
bool checkable;