summaryrefslogtreecommitdiffstats
path: root/tests/auto/qaction
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-04-231-33/+0
|\ | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * Revert "Fixed key sequence eating behavior for QShortcut and QAction."jasplin2009-04-231-33/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 031adeaf42ddaef8d01338f6c59ba97170be5d53. The patch had some unforeseen side-effects for Creator. It may also affect other existing applications in a similar way. For now, this behavior (eating key sequences for disabled shortcuts) should be achieved using a local workaround in creator. Reviewed-by: mariusSO Task-number: 251246
* | Merge branch '4.5'Thiago Macieira2009-04-201-0/+33
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * Fixed key sequence eating behavior for QShortcut and QAction.jasplin2009-04-201-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A disabled QShortcut should eat its key sequence even for complex sequences like "Ctrl-E 1". For example, a line edit with such a shortcut should not display 1 after typing "Ctrl-E" and then "1". The patch achieves this essentially by moving more of the decision making (of whether to eat the key secuence) from shortcutmap.cpp to qhortcut.cpp. Moreover, an invisible QAction should not eat any of its key sequences (primary nor alternates). In the example above, the line edit would display 1 when typing this sequence for an invisible action. The patch achieves this by temporarily unregistering all of the action's shortcuts while the action is invisible. Reviewed-by: mariusSO Task-number: 251246
| * Long live Qt 4.5!Lars Knoll2009-03-233-0/+331
|
* Long live Qt!Lars Knoll2009-03-233-0/+374