From 3f88da82b1bdf79fe4c89640838b0b69c8a89d8b Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 4 Oct 2011 12:14:01 +1000 Subject: Remove Symbian-only test function. Change-Id: I817c234a6104a072f131c17e9492c68d79ca5f8d Reviewed-on: http://codereview.qt-project.org/5943 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- .../auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 27 ---------------------- 1 file changed, 27 deletions(-) (limited to 'tests/auto') 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() { -- cgit v1.2.3