summaryrefslogtreecommitdiffstats
path: root/tests/auto/qobject/tst_qobject.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-17 13:43:30 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2011-05-18 16:09:29 +1000
commit49babe02f0a00fe2baff3950fbdcb725ce20d772 (patch)
treee0383c879f78ef74ba7a0fe394504c096312edf4 /tests/auto/qobject/tst_qobject.cpp
parent0cd93933d8e5cc69151958fc285936854ff86e47 (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/qobject/tst_qobject.cpp')
-rw-r--r--tests/auto/qobject/tst_qobject.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index a7e8d79345..5e0b970f9b 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -40,10 +40,8 @@
****************************************************************************/
-#define QT3_SUPPORT
#include <QtTest/QtTest>
-
#include <qcoreapplication.h>
#include <qpointer.h>
@@ -2834,11 +2832,6 @@ void tst_QObject::compatibilityChildInsertedEvents()
expected =
EventSpy::EventList()
-#ifdef QT_HAS_QT3SUPPORT
- << qMakePair(&object, QEvent::ChildInsertedRequest)
- << qMakePair(&object, QEvent::ChildInserted)
- << qMakePair(&object, QEvent::ChildInserted)
-#endif
<< qMakePair(&object, QEvent::Type(QEvent::User + 1))
<< qMakePair(&object, QEvent::Type(QEvent::User + 2));
QCOMPARE(spy.eventList(), expected);
@@ -2872,10 +2865,6 @@ void tst_QObject::compatibilityChildInsertedEvents()
expected =
EventSpy::EventList()
-#ifdef QT_HAS_QT3SUPPORT
- << qMakePair(&object, QEvent::ChildInsertedRequest)
- << qMakePair(&object, QEvent::ChildInserted)
-#endif
<< qMakePair(&object, QEvent::Type(QEvent::User + 1))
<< qMakePair(&object, QEvent::Type(QEvent::User + 2));
QCOMPARE(spy.eventList(), expected);