1 files changed, 44 insertions, 4 deletions
diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp b/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp
index d372505f8c..301be319bf 100644
--- a/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp
+++ b/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -21,6 +21,8 @@ private slots:
     void testKeys();
     void testLineEditContents();
     void testMaximumSequenceLength();
+    void testFinishingKeyCombinations_data();
+    void testFinishingKeyCombinations();
 };
 
 void tst_QKeySequenceEdit::testSetters()
@@ -35,7 +37,7 @@ void tst_QKeySequenceEdit::testSetters()
     edit.clear();
     QCOMPARE(edit.keySequence(), QKeySequence());
 
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 }
 
 void tst_QKeySequenceEdit::testKeys_data()
@@ -97,9 +99,9 @@ void tst_QKeySequenceEdit::testKeys()
     QTest::keyPress(&edit, key, modifiers);
     QTest::keyRelease(&edit, key, modifiers);
 
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     QCOMPARE(edit.keySequence(), keySequence);
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
 }
 
 void tst_QKeySequenceEdit::testLineEditContents()
@@ -123,5 +125,43 @@ void tst_QKeySequenceEdit::testLineEditContents()
     QCOMPARE(le->text(), QString());
 }
 
+void tst_QKeySequenceEdit::testFinishingKeyCombinations_data()
+{
+    QTest::addColumn<Qt::Key>("key");
+    QTest::addColumn<Qt::KeyboardModifiers>("modifiers");
+    QTest::addColumn<QKeySequence>("keySequence");
+
+    QTest::newRow("1") << Qt::Key_Backtab << Qt::KeyboardModifiers(Qt::NoModifier) << QKeySequence("Backtab");
+    QTest::newRow("2") << Qt::Key_Tab << Qt::KeyboardModifiers(Qt::NoModifier) << QKeySequence("Tab");
+    QTest::newRow("3") << Qt::Key_Return << Qt::KeyboardModifiers(Qt::NoModifier) << QKeySequence("Return");
+    QTest::newRow("4") << Qt::Key_Enter << Qt::KeyboardModifiers(Qt::NoModifier) << QKeySequence("Enter");
+    QTest::newRow("5") << Qt::Key_Enter << Qt::KeyboardModifiers(Qt::ShiftModifier) << QKeySequence("Shift+Enter");
+}
+
+void tst_QKeySequenceEdit::testFinishingKeyCombinations()
+{
+    QFETCH(Qt::Key, key);
+    QFETCH(Qt::KeyboardModifiers, modifiers);
+    QFETCH(QKeySequence, keySequence);
+    QKeySequenceEdit edit;
+
+    QSignalSpy spy(&edit, SIGNAL(editingFinished()));
+    QCOMPARE(spy.size(), 0);
+
+    edit.setFinishingKeyCombinations({QKeyCombination(modifiers, key)});
+    QTest::keyPress(&edit, key, modifiers);
+    QTest::keyRelease(&edit, key, modifiers);
+
+    QCOMPARE(edit.keySequence(), QKeySequence());
+    QTRY_COMPARE(spy.size(), 1);
+
+    edit.setFinishingKeyCombinations({});
+    QTest::keyPress(&edit, key, modifiers);
+    QTest::keyRelease(&edit, key, modifiers);
+
+    QCOMPARE(edit.keySequence(), keySequence);
+    QTRY_COMPARE(spy.size(), 2);
+}
+
 QTEST_MAIN(tst_QKeySequenceEdit)
 #include "tst_qkeysequenceedit.moc"