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/qcombobox.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/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 59b740f..aa90909 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -63,7 +63,7 @@ #include <private/qabstractitemmodel_p.h> #include <private/qabstractscrollarea_p.h> #include <qdebug.h> - +#include <qkeyeventsoftkey.h> #ifdef Q_WS_X11 #include <private/qt_x11_p.h> #endif @@ -75,9 +75,6 @@ #ifndef QT_NO_EFFECTS # include <private/qeffects_p.h> #endif -#ifdef QT_KEYPAD_NAVIGATION -# include <private/qsoftkeystack_p.h> -#endif QT_BEGIN_NAMESPACE extern QHash<QByteArray, QFont> *qt_app_fonts_hash(); @@ -2441,7 +2438,7 @@ void QComboBox::showPopup() #ifdef QT_KEYPAD_NAVIGATION if (QApplication::keypadNavigationEnabled()) view()->setEditFocus(true); - QKeyEventSoftKey::addSoftKey(QSoftKeyAction::Cancel, Qt::Key_Back, this); + QKeyEventSoftKey::addSoftKey(QAction::CancelSoftKey, Qt::Key_Back, this); #endif } |