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>

5 files changed, 34 insertions, 56 deletions

diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp
index 1440b5ca7b..20b98e2fc1 100644
--- a/src/tools/moc/keywords.cpp
+++ b/src/tools/moc/keywords.cpp
@@ -43,12 +43,12 @@
 // DO NOT EDIT.
 
 static const short keyword_trans[][128] = {
-    {0,0,0,0,0,0,0,0,0,541,538,0,0,0,0,0,
+    {0,0,0,0,0,0,0,0,0,532,529,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     541,252,539,542,0,38,239,540,25,26,236,234,30,235,27,237,
+     532,252,530,533,0,38,239,531,25,26,236,234,30,235,27,237,
      22,22,22,22,22,22,22,22,22,22,34,41,23,39,24,43,
      0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-     8,21,8,8,8,8,8,8,8,8,8,31,543,32,238,8,
+     8,21,8,8,8,8,8,8,8,8,8,31,534,32,238,8,
      0,1,2,3,4,5,6,7,8,9,8,8,10,11,12,13,
      14,8,15,16,17,18,19,20,8,8,8,36,245,37,248,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -190,7 +190,7 @@ static const short keyword_trans[][128] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,42,0,0,0,28,0,
-     546,546,546,546,546,546,546,546,546,546,0,0,0,0,0,0,
+     537,537,537,537,537,537,537,537,537,537,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -349,7 +349,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,544,
+     0,0,0,0,0,0,0,0,0,0,536,0,0,0,0,535,
      0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -392,7 +392,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,439,388,378,383,364,0,448,0,0,0,0,0,358,
-     370,0,530,436,0,0,0,0,0,0,0,0,0,0,0,0,
+     370,0,521,436,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -415,7 +415,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,513,0,437,0,0,0,465,0,0,471,0,0,0,
+     0,0,0,504,0,437,0,0,0,465,0,0,471,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -424,7 +424,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,450,0,506,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,450,0,497,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -432,15 +432,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     522,0,0,481,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,497,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,486,
+     513,0,0,481,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
 };
@@ -938,7 +930,7 @@ static const struct
     {CHARACTER, 0, 79, 483, CHARACTER},
     {CHARACTER, 0, 84, 484, CHARACTER},
     {Q_PRIVATE_SLOT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 49, 0, 0, CHARACTER},
+    {CHARACTER, 0, 95, 486, CHARACTER},
     {CHARACTER, 0, 77, 487, CHARACTER},
     {CHARACTER, 0, 79, 488, CHARACTER},
     {CHARACTER, 0, 67, 489, CHARACTER},
@@ -950,46 +942,37 @@ static const struct
     {CHARACTER, 0, 65, 495, CHARACTER},
     {CHARACTER, 0, 84, 496, CHARACTER},
     {Q_MOC_COMPAT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 95, 498, CHARACTER},
-    {CHARACTER, 0, 83, 499, CHARACTER},
-    {CHARACTER, 0, 85, 500, CHARACTER},
-    {CHARACTER, 0, 80, 501, CHARACTER},
-    {CHARACTER, 0, 80, 502, CHARACTER},
-    {CHARACTER, 0, 79, 503, CHARACTER},
-    {CHARACTER, 0, 82, 504, CHARACTER},
-    {CHARACTER, 0, 84, 505, CHARACTER},
-    {Q_QT3_SUPPORT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 79, 507, CHARACTER},
-    {CHARACTER, 0, 75, 508, CHARACTER},
+    {CHARACTER, 0, 79, 498, CHARACTER},
+    {CHARACTER, 0, 75, 499, CHARACTER},
+    {CHARACTER, 0, 65, 500, CHARACTER},
+    {CHARACTER, 0, 66, 501, CHARACTER},
+    {CHARACTER, 0, 76, 502, CHARACTER},
+    {CHARACTER, 0, 69, 503, CHARACTER},
+    {Q_INVOKABLE_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 82, 505, CHARACTER},
+    {CHARACTER, 0, 73, 506, CHARACTER},
+    {CHARACTER, 0, 80, 507, CHARACTER},
+    {CHARACTER, 0, 84, 508, CHARACTER},
     {CHARACTER, 0, 65, 509, CHARACTER},
     {CHARACTER, 0, 66, 510, CHARACTER},
     {CHARACTER, 0, 76, 511, CHARACTER},
     {CHARACTER, 0, 69, 512, CHARACTER},
-    {Q_INVOKABLE_TOKEN, 0, 0, 0, CHARACTER},
+    {Q_SCRIPTABLE_TOKEN, 0, 0, 0, CHARACTER},
     {CHARACTER, 0, 82, 514, CHARACTER},
-    {CHARACTER, 0, 73, 515, CHARACTER},
+    {CHARACTER, 0, 79, 515, CHARACTER},
     {CHARACTER, 0, 80, 516, CHARACTER},
-    {CHARACTER, 0, 84, 517, CHARACTER},
-    {CHARACTER, 0, 65, 518, CHARACTER},
-    {CHARACTER, 0, 66, 519, CHARACTER},
-    {CHARACTER, 0, 76, 520, CHARACTER},
-    {CHARACTER, 0, 69, 521, CHARACTER},
-    {Q_SCRIPTABLE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 82, 523, CHARACTER},
-    {CHARACTER, 0, 79, 524, CHARACTER},
-    {CHARACTER, 0, 80, 525, CHARACTER},
-    {CHARACTER, 0, 69, 526, CHARACTER},
-    {CHARACTER, 0, 82, 527, CHARACTER},
-    {CHARACTER, 0, 84, 528, CHARACTER},
-    {CHARACTER, 0, 89, 529, CHARACTER},
+    {CHARACTER, 0, 69, 517, CHARACTER},
+    {CHARACTER, 0, 82, 518, CHARACTER},
+    {CHARACTER, 0, 84, 519, CHARACTER},
+    {CHARACTER, 0, 89, 520, CHARACTER},
     {Q_PRIVATE_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 531, CHARACTER},
-    {CHARACTER, 0, 86, 532, CHARACTER},
-    {CHARACTER, 0, 73, 533, CHARACTER},
-    {CHARACTER, 0, 83, 534, CHARACTER},
-    {CHARACTER, 0, 73, 535, CHARACTER},
-    {CHARACTER, 0, 79, 536, CHARACTER},
-    {CHARACTER, 0, 78, 537, CHARACTER},
+    {CHARACTER, 0, 69, 522, CHARACTER},
+    {CHARACTER, 0, 86, 523, CHARACTER},
+    {CHARACTER, 0, 73, 524, CHARACTER},
+    {CHARACTER, 0, 83, 525, CHARACTER},
+    {CHARACTER, 0, 73, 526, CHARACTER},
+    {CHARACTER, 0, 79, 527, CHARACTER},
+    {CHARACTER, 0, 78, 528, CHARACTER},
     {Q_REVISION_TOKEN, 0, 0, 0, CHARACTER},
     {NEWLINE, 0, 0, 0, NOTOKEN},
     {QUOTE, 0, 0, 0, NOTOKEN},
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index d725919cac..4f414ba35e 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -165,7 +165,6 @@ Type Moc::parseType()
                     type.isVolatile = true;
                 continue;
             case Q_MOC_COMPAT_TOKEN:
-            case Q_QT3_SUPPORT_TOKEN:
             case Q_INVOKABLE_TOKEN:
             case Q_SCRIPTABLE_TOKEN:
             case Q_SIGNALS_TOKEN:
@@ -323,7 +322,6 @@ bool Moc::testFunctionAttribute(Token tok, FunctionDef *def)
 {
     switch (tok) {
         case Q_MOC_COMPAT_TOKEN:
-        case Q_QT3_SUPPORT_TOKEN:
             def->isCompat = true;
             return true;
         case Q_INVOKABLE_TOKEN:
diff --git a/src/tools/moc/token.cpp b/src/tools/moc/token.cpp
index 25b5b62d0f..0b702bb2a0 100644
--- a/src/tools/moc/token.cpp
+++ b/src/tools/moc/token.cpp
@@ -213,7 +213,6 @@ const char *tokenTypeName(Token t)
         case PP_MOC_FALSE: return "PP_MOC_FALSE";
         case Q_DECLARE_METATYPE_TOKEN: return "Q_DECLARE_METATYPE_TOKEN";
         case Q_MOC_COMPAT_TOKEN: return "Q_MOC_COMPAT_TOKEN";
-        case Q_QT3_SUPPORT_TOKEN: return "Q_QT3_SUPPORT_TOKEN";
         case Q_INVOKABLE_TOKEN: return "Q_INVOKABLE_TOKEN";
         case Q_SCRIPTABLE_TOKEN: return "Q_SCRIPTABLE_TOKEN";
     }
diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h
index 04e69141b6..3a5f01d638 100644
--- a/src/tools/moc/token.h
+++ b/src/tools/moc/token.h
@@ -182,7 +182,6 @@ enum Token {
     Q_SLOT_TOKEN,
     Q_PRIVATE_SLOT_TOKEN,
     Q_MOC_COMPAT_TOKEN,
-    Q_QT3_SUPPORT_TOKEN,
     Q_INVOKABLE_TOKEN,
     Q_SCRIPTABLE_TOKEN,
     Q_PRIVATE_PROPERTY_TOKEN,
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp
index c40eb18c1e..0c6f331e64 100644
--- a/src/tools/moc/util/generate_keywords.cpp
+++ b/src/tools/moc/util/generate_keywords.cpp
@@ -243,7 +243,6 @@ static const Keyword keywords[] = {
     { "Q_SLOTS", "Q_SLOTS_TOKEN" },
     { "Q_PRIVATE_SLOT", "Q_PRIVATE_SLOT_TOKEN" },
     { "QT_MOC_COMPAT", "Q_MOC_COMPAT_TOKEN" },
-    { "QT3_SUPPORT", "Q_QT3_SUPPORT_TOKEN" },
     { "Q_INVOKABLE", "Q_INVOKABLE_TOKEN" },
     { "Q_SIGNAL", "Q_SIGNAL_TOKEN" },
     { "Q_SLOT", "Q_SLOT_TOKEN" },