summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-04 14:22:40 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-06 01:27:58 +0200
commit1fad83bac6d8606296588a688862f3883ea6f0d1 (patch)
tree6092b3929b312fb72db5fe408219900f11a688d5 /tests/auto/gui
parentaa52c26f094f2e109a96d32aad5d9e46f3fcfbd8 (diff)
Remove last remnants of symbian in autotests.
Change-Id: I91489614653cfe4bcf16b723976e33531402a464 Reviewed-on: http://codereview.qt-project.org/5948 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index e7a484365a..0a2a20a29b 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -350,9 +350,6 @@ void tst_QKeySequence::standardKeys_data()
QTest::newRow("forward") << (int)QKeySequence::Forward << QString("CTRL+]");
QTest::newRow("backward") << (int)QKeySequence::Back << QString("CTRL+[");
QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+DOWN"); //mac only
-#elif defined(Q_WS_S60)
- QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F2");
- QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only
#else
QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F1");
QTest::newRow("nextChild") << (int)QKeySequence::NextChild<< QString("CTRL+Tab");
@@ -377,7 +374,7 @@ void tst_QKeySequence::keyBindings()
{
QList<QKeySequence> bindings = QKeySequence::keyBindings(QKeySequence::Copy);
QList<QKeySequence> expected;
-#if defined(Q_WS_MAC) || defined (Q_WS_S60)
+#if defined(Q_WS_MAC)
expected << QKeySequence("CTRL+C");
#elif defined Q_WS_X11
expected << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT");