From ae8c61db218dbd4329a6b10aa174ed4ef30de7d5 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Tue, 20 Dec 2011 14:59:09 +0100
Subject: Finish removing Qt3 support

Remove the (-no)-qt3support options from configure, and remove the last
remaining references to Qt3Support, QT3_SUPPORT, and
QEvent::ChildInserted.

The compatibilityChildInsertEvents() tests in tst_QObject and
tst_QWidget have been renamed to childEvents(), which is a more
appropriate name.

Change-Id: Id0b45e9b177efcc8dceee8c9ed8afafedeeace2f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/auto/corelib')

diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index cec25136b6..2c99d1b556 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -97,7 +97,7 @@ private slots:
     void recursiveSignalEmission();
 #endif
     void blockingQueuedConnection();
-    void compatibilityChildInsertedEvents();
+    void childEvents();
     void installEventFilter();
     void deleteSelfInSlot();
     void disconnectSelfInSlotAndDeleteAfterEmit();
@@ -2868,7 +2868,7 @@ private:
     EventList events;
 };
 
-void tst_QObject::compatibilityChildInsertedEvents()
+void tst_QObject::childEvents()
 {
     EventSpy::EventList expected;
 
@@ -2889,7 +2889,7 @@ void tst_QObject::compatibilityChildInsertedEvents()
     }
 
     {
-        // 2 children, so we expect 2 ChildAdded and 2 ChildInserted events
+        // 2 children, so we expect 2 ChildAdded events
         QObject object;
         EventSpy spy;
         object.installEventFilter(&spy);
@@ -2920,7 +2920,7 @@ void tst_QObject::compatibilityChildInsertedEvents()
 
     {
         // 2 children, but one is reparented away, so we expect:
-        // 2 ChildAdded, 1 ChildRemoved, and 1 ChildInserted
+        // 2 ChildAdded, 1 ChildRemoved
         QObject object;
         EventSpy spy;
         object.installEventFilter(&spy);
-- 
cgit v1.2.3