From 626977958873752c264604d93cc3564f46aab731 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 10 Apr 2017 14:25:29 +0200 Subject: QQuickAction: keep track whether explicitly enabled An enabled ActionGroup enables all its actions, except those explicitly disabled. Change-Id: I917dbb1d382bbb2e254a20933b13af8adfe8faa4 Reviewed-by: Mitch Curtis --- tests/auto/controls/data/tst_action.qml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/auto/controls/data/tst_action.qml') diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml index 192d89b1..7d057c26 100644 --- a/tests/auto/controls/data/tst_action.qml +++ b/tests/auto/controls/data/tst_action.qml @@ -78,13 +78,16 @@ TestCase { var spy = createTemporaryObject(signalSpy, testCase, {target: action, signalName: "triggered"}) verify(spy.valid) - action.enabled = false action.trigger() - compare(spy.count, 0) + compare(spy.count, 1) - action.enabled = true + action.enabled = false action.trigger() compare(spy.count, 1) + + action.enabled = undefined // reset + action.trigger() + compare(spy.count, 2) } Component { -- cgit v1.2.3