summaryrefslogtreecommitdiffstats
path: root/tests/auto/qbuttongroup
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-04-11 12:43:28 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-04-18 10:18:44 +1000
commited3703f6779e7bc94744347eeb4d925d0f7f267c (patch)
treeca102dbfdaf678bbb22370ce0b40344982c5acc8 /tests/auto/qbuttongroup
parent7b0d6dce4b00c190b57da1edc65cd129765cdd24 (diff)
Remove autotest code related to old Qt versions
Reviewed-by: Rohan McGovern
Diffstat (limited to 'tests/auto/qbuttongroup')
-rw-r--r--tests/auto/qbuttongroup/tst_qbuttongroup.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
index a809101d2e..34be20c94b 100644
--- a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
@@ -98,10 +98,7 @@ private slots:
void task106609();
- // fixed for Qt 4.6.0
-#if QT_VERSION >= 0x040600
void autoIncrementId();
-#endif
void task209485_removeFromGroupInEventHandler_data();
void task209485_removeFromGroupInEventHandler();
@@ -338,10 +335,7 @@ void tst_QButtonGroup::testSignals()
QCOMPARE(clickedSpy.count(), 1);
QCOMPARE(clickedIdSpy.count(), 1);
- int expectedId = -1;
-#if QT_VERSION >= 0x040600
- expectedId = -2;
-#endif
+ int expectedId = -2;
QVERIFY(clickedIdSpy.takeFirst().at(0).toInt() == expectedId);
QCOMPARE(pressedSpy.count(), 1);
@@ -500,7 +494,6 @@ void tst_QButtonGroup::task209485_removeFromGroupInEventHandler()
QCOMPARE(spy1.count() + spy2.count(), signalCount);
}
-#if QT_VERSION >= 0x040600
void tst_QButtonGroup::autoIncrementId()
{
QDialog dlg(0);
@@ -529,7 +522,6 @@ void tst_QButtonGroup::autoIncrementId()
dlg.show();
}
-#endif
QTEST_MAIN(tst_QButtonGroup)
#include "tst_qbuttongroup.moc"