diff options
author | Liang Qi <liang.qi@digia.com> | 2014-01-07 08:57:34 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 18:55:10 +0100 |
commit | 35f2a61426dab80af464b0aa24d41a070b4c145c (patch) | |
tree | 103d9bb7dc0388566b0ab48613668b5b2ca43588 /tests | |
parent | dbaff44ff1ebf04c5d2533f7a345db09cd55b00d (diff) |
QKeySequence: return Qt::Key_unknown with invalid modifiers on OS X
This also fixes the auto test, tst_QKeySequence::parseString() with
Win+A and Simon+G.
[ChangeLog][QtGui][OS X][QKeySequence] return Qt::Key_unknown with
invalid modifiers on OS X
Task-number: QTBUG-24406
Change-Id: Ie90393c9691f443c7c359cb3a487609a9691bc44
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 19fcb6ea9f..bd7bd3a464 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -606,11 +606,6 @@ void tst_QKeySequence::parseString() QFETCH( QString, strSequence ); QFETCH( QKeySequence, keycode ); -#ifdef Q_OS_MAC - QEXPECT_FAIL("Win+A", "QTBUG-24406 - This test fails on OSX", Abort); - QEXPECT_FAIL("Simon+G", "QTBUG-24406 - This test fails on OSX", Abort); -#endif - QCOMPARE( QKeySequence(strSequence).toString(), keycode.toString() ); QVERIFY( QKeySequence(strSequence) == keycode ); } |