1 files changed, 52 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 5b9f8f4f43..4bbf8f7b5c 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -24,6 +24,7 @@
 #include <qtablewidget.h>
 #include <qscrollbar.h>
 #include <qboxlayout.h>
+#include <qshortcut.h>
 #include <qstackedwidget.h>
 
 #include <qstandarditemmodel.h>
@@ -149,6 +150,7 @@ private slots:
     void propagateStyleChanges();
     void buttonPressKeys();
     void clearModel();
+    void cancelClosesPopupNotDialog();
 
 private:
     PlatformInputContext m_platformInputContext;
@@ -3635,5 +3637,55 @@ void tst_QComboBox::clearModel()
     QCOMPARE(combo.currentText(), QString());
 }
 
+void tst_QComboBox::cancelClosesPopupNotDialog()
+{
+    if (QGuiApplication::platformName() == "offscreen")
+        QSKIP("The offscreen platform plugin doesn't activate popups.");
+
+    QDialog dialog;
+    QComboBox combobox;
+    combobox.addItems({"A", "B", "C"});
+
+    std::unique_ptr<QShortcut> shortcut(new QShortcut(QKeySequence::Cancel, &dialog));
+    bool shortcutTriggered = false;
+    connect(shortcut.get(), &QShortcut::activated, [&shortcutTriggered]{
+        shortcutTriggered = true;
+    });
+
+    QVBoxLayout vbox;
+    vbox.addWidget(&combobox);
+    dialog.setLayout(&vbox);
+
+    dialog.show();
+    QVERIFY(QTest::qWaitForWindowActive(&dialog));
+
+    // while the combobox is closed, escape key triggers the shortcut
+    QTest::keyClick(dialog.window()->windowHandle(), Qt::Key_Escape);
+    QVERIFY(shortcutTriggered);
+    shortcutTriggered = false;
+
+    combobox.showPopup();
+    QTRY_VERIFY(combobox.view()->isVisible());
+
+    // an open combobox overrides and accepts the escape key to close
+    QTest::keyClick(dialog.window()->windowHandle(), Qt::Key_Escape);
+    QVERIFY(!shortcutTriggered);
+    shortcutTriggered = false;
+    QTRY_VERIFY(!combobox.view()->isVisible());
+    QVERIFY(dialog.isVisible());
+
+    // once closed, escape key triggers the shortcut again
+    QTest::keyClick(dialog.window()->windowHandle(), Qt::Key_Escape);
+    QVERIFY(shortcutTriggered);
+    shortcutTriggered = false;
+    QVERIFY(dialog.isVisible());
+
+    shortcut.reset();
+
+    // without shortcut, escape key propagates to the parent
+    QTest::keyClick(dialog.window()->windowHandle(), Qt::Key_Escape);
+    QVERIFY(!dialog.isVisible());
+}
+
 QTEST_MAIN(tst_QComboBox)
 #include "tst_qcombobox.moc"