diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-09-09 07:19:59 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-09-09 07:19:59 -0700 |
| commit | 167a55f6f5285c7c6572116ef98f3818eb331edd (patch) | |
| tree | c06a55b141b4e3e4fdfbdc24dad7152ef94b0cd5 /qt-ui/modeldelegates.cpp | |
| parent | 21c32d7f032e302d1cc167b5acd70f37c24453b1 (diff) | |
| parent | b4a609f46fb2c66798d4d56f59ce44c26fc8f3f8 (diff) | |
| download | subsurface-167a55f6f5285c7c6572116ef98f3818eb331edd.tar.gz | |
Merge branch 'moreDivePlanner' of https://github.com/tcanabrava/subsurface
Diffstat (limited to 'qt-ui/modeldelegates.cpp')
| -rw-r--r-- | qt-ui/modeldelegates.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index b183e170b..3549625f3 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -108,7 +108,7 @@ void ComboBoxDelegate::testActivation(const QString& s) bool ComboBoxDelegate::eventFilter(QObject* object, QEvent* event) { // Reacts on Key_UP and Key_DOWN to show the QComboBox - list of choices. - if (event->type() == QEvent::KeyPress){ + if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride){ if (object == currCombo.comboEditor){ // the 'LineEdit' part QKeyEvent *ev = static_cast<QKeyEvent*>(event); if(ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down){ |