From 110b7187cef4a920423e860ef0e10f819c283fa2 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 24 Apr 2018 22:24:14 +0200
Subject: 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>
---
 src/quicktemplates2/qquickcombobox.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/quicktemplates2/qquickcombobox.cpp')

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;
-- 
cgit v1.2.3