summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorMatthew Cattell <matthew.cattell@nokia.com>2011-09-12 17:33:42 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-09-12 21:48:57 +0200
commitd96057f8f4b2b2bbf73e5de8b2dd565b295ebe01 (patch)
tree41673605a4db155c8f8622e0da0d68f36b1d3fd5 /src/testlib
parentfa42faaee527b9822500cd9a69023be817083d92 (diff)
added ascii translations to qasciikey for keyup and keydown
Change-Id: I7645392b437bdaa5e981dbf07cac70ee1653b624 Reviewed-on: http://codereview.qt-project.org/4689 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qasciikey.cpp2
-rw-r--r--src/testlib/qtestkeyboard.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/testlib/qasciikey.cpp b/src/testlib/qasciikey.cpp
index 874b9a06c7..80e94acd0b 100644
--- a/src/testlib/qasciikey.cpp
+++ b/src/testlib/qasciikey.cpp
@@ -59,6 +59,8 @@ Qt::Key QTest::asciiToKey(char ascii)
case 0x0b: return Qt::Key_Backtab;
case 0x0d: return Qt::Key_Return;
case 0x1b: return Qt::Key_Escape;
+ case 0x13: return Qt::Key_Up;
+ case 0x15: return Qt::Key_Down;
case 0x20: return Qt::Key_Space;
case 0x21: return Qt::Key_Exclam;
case 0x22: return Qt::Key_QuoteDbl;
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index 2e5469093c..4dfdaeaf56 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -162,7 +162,6 @@ namespace QTest
{
QTEST_ASSERT(qApp);
QTEST_ASSERT(window);
- QTEST_ASSERT(window->windowState() == Qt::WindowActive);
if (action == Click) {
sendKeyEvent(Press, window, code, text, modifier, delay);