diff options
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index cf64ae95..c41265a4 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -781,6 +781,7 @@ void QQuickComboBox::keyPressEvent(QKeyEvent *event) switch (event->key()) { case Qt::Key_Escape: + case Qt::Key_Back: if (d->isPopupVisible()) event->accept(); break; @@ -828,6 +829,7 @@ void QQuickComboBox::keyReleaseEvent(QKeyEvent *event) event->accept(); break; case Qt::Key_Escape: + case Qt::Key_Back: d->hidePopup(false); setPressed(false); event->accept(); diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 6d969e30..9279b261 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -1831,7 +1831,7 @@ void QQuickPopup::keyPressEvent(QKeyEvent *event) if (hasActiveFocus() && (event->key() == Qt::Key_Tab || event->key() == Qt::Key_Backtab)) QQuickItemPrivate::focusNextPrev(d->popupItem, event->key() == Qt::Key_Tab); - if (event->key() != Qt::Key_Escape) + if (event->key() != Qt::Key_Escape && event->key() != Qt::Key_Back) return; if (d->closePolicy.testFlag(CloseOnEscape)) |