summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-11-06 10:28:52 +0100
committerJørgen Lind <jorgen.lind@nokia.com>2009-11-06 13:17:01 +0100
commit628a0d9d54f50a9e75cb8f26e4927231a2130e84 (patch)
tree160ab411b5f7b9096826fce5cdc49dda0ab5bff2
parent4bbcfc85eb69f7a04b1ec4264ded855be0df46d7 (diff)
Fix QT_NO_SHORTCUT
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
-rw-r--r--src/gui/statemachine/qguistatemachine.cpp2
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp
index 68f737a24f..4db10ca8ff 100644
--- a/src/gui/statemachine/qguistatemachine.cpp
+++ b/src/gui/statemachine/qguistatemachine.cpp
@@ -255,8 +255,10 @@ static QEvent *cloneEvent(QEvent *e)
case QEvent::FileOpen:
return new QFileOpenEvent(*static_cast<QFileOpenEvent*>(e));
+#ifndef QT_NO_SHORTCUT
case QEvent::Shortcut:
return new QShortcutEvent(*static_cast<QShortcutEvent*>(e));
+#endif //QT_NO_SHORTCUT
case QEvent::ShortcutOverride:
return new QKeyEvent(*static_cast<QKeyEvent*>(e));
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index aa51759a61..e0e20db540 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();