diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-06 14:17:01 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-06 14:17:01 (GMT) |
| commit | 7749376ff1536c703d223e16506eed1a61132a41 (patch) | |
| tree | 2fd25759abe44aa64d349a673b27c7cfad205159 /src/gui/widgets/qmenu.cpp | |
| parent | 934ebcd3e3c1c568ac8371dbb1d96cd06385883d (diff) | |
| download | Qt-7749376ff1536c703d223e16506eed1a61132a41.zip Qt-7749376ff1536c703d223e16506eed1a61132a41.tar.gz Qt-7749376ff1536c703d223e16506eed1a61132a41.tar.bz2 | |
Removed QSoftKeyStack and replaced places using it with the
new improved softkey interface in QWidget
Diffstat (limited to 'src/gui/widgets/qmenu.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index c4db539..d713081 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -60,9 +60,7 @@ #ifndef QT_NO_WHATSTHIS # include <qwhatsthis.h> #endif -#ifdef QT_KEYPAD_NAVIGATION -# include <private/qsoftkeystack_p.h> -#endif +#include <qkeyeventsoftkey.h> #include "qmenu_p.h" #include "qmenubar_p.h" @@ -586,7 +584,7 @@ void QMenuPrivate::setCurrentAction(QAction *action, int popup, SelectionReason #ifdef QT_KEYPAD_NAVIGATION // TODO: aportale, remove KEYPAD_NAVIGATION_HACK when softkey stack // handles focus related and user related actions separately... - QKeyEventSoftKey::addSoftKey(QSoftKeyAction::Cancel, Qt::Key_Back, q); + QKeyEventSoftKey::addSoftKey(QAction::CancelSoftKey, Qt::Key_Back, q); #endif } } @@ -1947,7 +1945,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction) QAccessible::updateAccessibility(this, 0, QAccessible::PopupMenuStart); #endif #ifdef QT_KEYPAD_NAVIGATION - QKeyEventSoftKey::addSoftKey(QSoftKeyAction::Cancel, Qt::Key_Back, this); + QKeyEventSoftKey::addSoftKey(QAction::CancelSoftKey, Qt::Key_Back, this); #endif } |