diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-24 22:24:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-25 05:42:37 +0000 |
| commit | 110b7187cef4a920423e860ef0e10f819c283fa2 (patch) | |
| tree | e18f2fc57930315703f8a953281a3d255b0ecdb6 /src/quicktemplates2/qquickcombobox.cpp | |
| parent | def92f7b657ee9247beffffcb0cadd1eca8be3c6 (diff) | |
Revert "ComboBox: don't block the escape/back key"
This change got integrated by sick COIN.
This reverts commit def92f7b657ee9247beffffcb0cadd1eca8be3c6.
Task-number: QTBUG-67930
Change-Id: I541579d7112ba386b227b7892d4e0aa8e2bd4edf
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 4d5efece..d3226baf 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1624,11 +1624,9 @@ void QQuickComboBox::keyReleaseEvent(QKeyEvent *event) break; case Qt::Key_Escape: case Qt::Key_Back: - if (d->isPopupVisible()) { - d->hidePopup(false); - setPressed(false); - event->accept(); - } + d->hidePopup(false); + setPressed(false); + event->accept(); break; default: break; |