diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-03 17:55:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-20 02:11:41 +0200 |
| commit | 66c2c264b32748ea5a80cdd33fd6d7909e9825ed (patch) | |
| tree | 77f3f4f6c9c75c1eaeae3db869504da155f4025a /tests/auto/controls/data/shortcut | |
| parent | 8480dcbc7180cf1bcafcd03a6ad7087c83582a97 (diff) | |
| download | qtquickcontrols-66c2c264b32748ea5a80cdd33fd6d7909e9825ed.tar.gz | |
Fix disabling of Action
A disabled action was reported as ambiguous with a non-amb. one. Instead
just ignore the disabled one.
Change-Id: I6e03b126a5ef1dddc2342c5c2b27ff6541839e33
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests/auto/controls/data/shortcut')
| -rw-r--r-- | tests/auto/controls/data/shortcut/shortcuts.qml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/controls/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml index 56096dee..daf11103 100644 --- a/tests/auto/controls/data/shortcut/shortcuts.qml +++ b/tests/auto/controls/data/shortcut/shortcuts.qml @@ -56,7 +56,17 @@ Rectangle { shortcut: "a" onTriggered: text.text = "a pressed" } + Action { // ambiguous but disabled + enabled: false + shortcut: "a" + onTriggered: text.text = "a (disabled) pressed" + } + Action { // ambiguous but disabled + enabled: false + shortcut: "b" + onTriggered: text.text = "b (disabled) pressed" + } Action { shortcut: "b" onTriggered: text.text = "b pressed" |