diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-17 13:43:30 +1000 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-18 16:09:29 +1000 |
| commit | 49babe02f0a00fe2baff3950fbdcb725ce20d772 (patch) | |
| tree | e0383c879f78ef74ba7a0fe394504c096312edf4 /tests/auto/qtabwidget | |
| parent | 0cd93933d8e5cc69151958fc285936854ff86e47 (diff) | |
Remove autotest code for Qt3Support library.
This commit deals with the simple cases -- mostly just removing blocks
of code enclosed in #ifdef QT3_SUPPORT. Later commits will deal with
the trickier cases.
Change-Id: I280dea25b3754be175efe62fc7e5e4e7c304e658
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
Diffstat (limited to 'tests/auto/qtabwidget')
| -rw-r--r-- | tests/auto/qtabwidget/tst_qtabwidget.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp index 252450cc71..c305150af4 100644 --- a/tests/auto/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp @@ -381,9 +381,6 @@ void tst_QTabWidget::currentIndex() { // Test bad arguments QSignalSpy spy(tw, SIGNAL(currentChanged(int))); -#ifdef QT3_SUPPORT - QSignalSpy spySupport(tw, SIGNAL(currentChanged(QWidget *))); -#endif QCOMPARE(tw->currentIndex(), -1); tw->setCurrentIndex(-1); QCOMPARE(tw->currentIndex(), -1); @@ -395,10 +392,7 @@ void tst_QTabWidget::currentIndex() QCOMPARE(spy.count(), 1); QList<QVariant> arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == firstIndex); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 1); -#endif - + int index = addPage(); QCOMPARE(tw->currentIndex(), firstIndex); tw->setCurrentIndex(index); @@ -406,28 +400,18 @@ void tst_QTabWidget::currentIndex() QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == index); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 2); -#endif - + removePage(index); QCOMPARE(tw->currentIndex(), firstIndex); QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == firstIndex); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 3); -#endif removePage(firstIndex); QCOMPARE(tw->currentIndex(), -1); QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == -1); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 4); -#endif - } void tst_QTabWidget::cornerWidget() |