Fix disabling of Action
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 3 Oct 2013 15:55:35 +0000 (17:55 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sun, 20 Oct 2013 00:11:41 +0000 (02:11 +0200)
commit66c2c264b32748ea5a80cdd33fd6d7909e9825ed
tree77f3f4f6c9c75c1eaeae3db869504da155f4025a
parent8480dcbc7180cf1bcafcd03a6ad7087c83582a97
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>
src/controls/qquickaction.cpp
tests/auto/controls/data/shortcut/shortcuts.qml