From 3e2f32547de39133d8c4e2d2f70ed2254b2bcc76 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 3 Jan 2012 13:34:49 +0100 Subject: If decodestring can't translate the string return Qt::Key_unknown. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie082b326e944a28b4e29984a527e3841a05b32f6 Reviewed-by: Morten Johan Sørvig --- tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index e5820e12fe..fcc30a7afe 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -537,6 +537,9 @@ void tst_QKeySequence::parseString_data() QTest::newRow("Win+A") << "Win+a" << QKeySequence(Qt::Key_unknown); QTest::newRow("4+3=2") << "4+3=2" << QKeySequence(Qt::Key_unknown); QTest::newRow("Super+Meta+A") << "Super+Meta+A" << QKeySequence(Qt::Key_unknown); + QTest::newRow("Meta+Trolls") << "Meta+Trolls" << QKeySequence(Qt::Key_unknown); + QTest::newRow("Alabama") << "Alabama" << QKeySequence(Qt::Key_unknown); + QTest::newRow("Simon+G") << "Simon+G" << QKeySequence(Qt::Key_unknown); } void tst_QKeySequence::parseString() @@ -559,6 +562,9 @@ void tst_QKeySequence::fromString() QFETCH(QString, neutralString); QFETCH(QString, platformString); + if (strSequence == "Ctrly") // Key_Unknown gives empty string + return; + QKeySequence ks1(strSequence); QKeySequence ks2 = QKeySequence::fromString(ks1.toString()); QKeySequence ks3 = QKeySequence::fromString(neutralString, QKeySequence::PortableText); -- cgit v1.2.3