diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-06 15:39:53 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-06 15:39:53 (GMT) |
| commit | 53c36eb868a800569557e01ba075964127e9cffd (patch) | |
| tree | 0847756bbed8c30268940334d1bf57d9fa509348 /src/plugins/accessible/widgets/simplewidgets.cpp | |
| parent | daf5f511ee813fc4fffba64bed558d0413270388 (diff) | |
| parent | 6d7d54813f4cfc326fc52d3402653b924677124a (diff) | |
| download | Qt-53c36eb868a800569557e01ba075964127e9cffd.zip Qt-53c36eb868a800569557e01ba075964127e9cffd.tar.gz Qt-53c36eb868a800569557e01ba075964127e9cffd.tar.bz2 | |
Merge branch 'feature' into 4.6
Diffstat (limited to 'src/plugins/accessible/widgets/simplewidgets.cpp')
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index 1d801e4..87d81f0 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -256,9 +256,9 @@ QString QAccessibleButton::localizedName(int actionIndex) QStringList QAccessibleButton::keyBindings(int actionIndex) { switch (actionIndex) { -#ifdef QT_NO_SHORTCUT +#ifndef QT_NO_SHORTCUT case 0: - return button()->shortcut().toString(); + return QStringList() << button()->shortcut().toString(); #endif default: return QStringList(); |