diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-04 12:14:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-05 03:05:33 +0200 |
| commit | 3f88da82b1bdf79fe4c89640838b0b69c8a89d8b (patch) | |
| tree | 6a2b91ab8af15475de02d6d10c8b43706168cbc7 /tests/auto | |
| parent | 7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6 (diff) | |
Remove Symbian-only test function.
Change-Id: I817c234a6104a072f131c17e9492c68d79ca5f8d
Reviewed-on: http://codereview.qt-project.org/5943
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index def5e60549..449cc5e44d 100644 --- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -110,7 +110,6 @@ private slots: void testSignalOrder(); void testDefaultButton_data(); void testDefaultButton(); - void testS60SoftKeys(); #ifdef QT_SOFTKEYS_ENABLED void testSoftKeyReparenting(); #endif @@ -731,32 +730,6 @@ static int softKeyCount(QWidget *widget) return softkeyCount; } -void tst_QDialogButtonBox::testS60SoftKeys() -{ -#ifdef Q_WS_S60 - QDialog dialog(0); - QDialogButtonBox buttonBox(&dialog); - buttonBox.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - dialog.show(); - -#ifndef QT_NO_ACTION - QCOMPARE( softKeyCount(&dialog), 2); -#endif - - QDialog dialog2(0); - QDialogButtonBox buttonBox2(&dialog2); - buttonBox2.setStandardButtons(QDialogButtonBox::Cancel); - dialog2.show(); - -#ifndef QT_NO_ACTION - QCOMPARE( softKeyCount(&dialog2), 1); -#endif - -#else - QSKIP("S60-specific test", SkipAll ); -#endif -} - #ifdef QT_SOFTKEYS_ENABLED void tst_QDialogButtonBox::testSoftKeyReparenting() { |