1 files changed, 13 insertions, 11 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 60000316cc..c83e7af503 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -1320,13 +1320,13 @@ void tst_QMetaObject::normalizedSignature_data()
     QTest::newRow("function ptr spaces") << "void foo( void ( * ) ( void ))" << "void foo(void(*)())";
     QTest::newRow("function ptr void*") << "void foo(void(*)(void*))" << "void foo(void(*)(void*))";
     QTest::newRow("function ptr void* spaces") << "void foo( void ( * ) ( void * ))" << "void foo(void(*)(void*))";
-    QTest::newRow("template args") << " void  foo( QMap<a, a>, QList<b>) "
-                                   << "void foo(QMap<a,a>,QList<b>)";
+    QTest::newRow("template args") << " void  foo( QMap<a, a>, QVector<b>) "
+                                   << "void foo(QMap<a,a>,QVector<b>)";
     QTest::newRow("void template args") << " void  foo( Foo<void>, Bar<void> ) "
                                    << "void foo(Foo<void>,Bar<void>)";
     QTest::newRow("void* template args") << " void  foo( Foo<void*>, Bar<void *> ) "
                                    << "void foo(Foo<void*>,Bar<void*>)";
-    QTest::newRow("rettype") << "QList<int, int> foo()" << "QList<int,int>foo()";
+    QTest::newRow("rettype") << "QVector<int, int> foo()" << "QVector<int,int>foo()";
     QTest::newRow("rettype void template") << "Foo<void> foo()" << "Foo<void>foo()";
     QTest::newRow("const rettype") << "const QString *foo()" << "const QString*foo()";
     QTest::newRow("const ref") << "const QString &foo()" << "const QString&foo()";
@@ -1337,15 +1337,16 @@ void tst_QMetaObject::normalizedSignature_data()
     QTest::newRow("const4") << "void foo(const int)" << "void foo(int)";
     QTest::newRow("const5") << "void foo(const int, int const, const int &, int const &)"
                             << "void foo(int,int,int,int)";
-    QTest::newRow("const6") << "void foo(QList<const int>)" << "void foo(QList<const int>)";
-    QTest::newRow("const7") << "void foo(QList<const int*>)" << "void foo(QList<const int*>)";
-    QTest::newRow("const8") << "void foo(QList<int const*>)" << "void foo(QList<const int*>)";
+    QTest::newRow("const6") << "void foo(QVector<const int>)" << "void foo(QVector<const int>)";
+    QTest::newRow("const7") << "void foo(QVector<const int*>)" << "void foo(QVector<const int*>)";
+    QTest::newRow("const8") << "void foo(QVector<int const*>)" << "void foo(QVector<const int*>)";
     QTest::newRow("const9") << "void foo(const Foo<Bar>)" << "void foo(Foo<Bar>)";
     QTest::newRow("const10") << "void foo(Foo<Bar>const)" << "void foo(Foo<Bar>)";
     QTest::newRow("const11") << "void foo(Foo<Bar> *const)" << "void foo(Foo<Bar>*const)";
     QTest::newRow("const12") << "void foo(Foo<Bar>const*const *const)" << "void foo(Foo<Bar>*const*const)";
     QTest::newRow("const13") << "void foo(const Foo<Bar>&)" << "void foo(Foo<Bar>)";
     QTest::newRow("const14") << "void foo(Foo<Bar>const&)" << "void foo(Foo<Bar>)";
+    QTest::newRow("QList") << "void foo(QList<int>)" << "void foo(QVector<int>)";
 
     QTest::newRow("invalid1") << "a( b" << "a(b";
 }
@@ -1367,13 +1368,13 @@ void tst_QMetaObject::normalizedType_data()
     QTest::newRow("white") << "  int  " << "int";
     QTest::newRow("const1") << "int const *" << "const int*";
     QTest::newRow("const2") << "const int *" << "const int*";
-    QTest::newRow("template1") << "QList<int const *>" << "QList<const int*>";
-    QTest::newRow("template2") << "QList<const int *>" << "QList<const int*>";
+    QTest::newRow("template1") << "QVector<int const *>" << "QVector<const int*>";
+    QTest::newRow("template2") << "QVector<const int *>" << "QVector<const int*>";
     QTest::newRow("template3") << "QMap<QString, int>" << "QMap<QString,int>";
     QTest::newRow("template4") << "const QMap<QString, int> &" << "QMap<QString,int>";
-    QTest::newRow("template5") << "QList< ::Foo::Bar>" << "QList< ::Foo::Bar>";
-    QTest::newRow("template6") << "QList<::Foo::Bar>" << "QList<::Foo::Bar>";
-    QTest::newRow("template7") << "QList<QList<int> >" << "QList<QList<int> >";
+    QTest::newRow("template5") << "QVector< ::Foo::Bar>" << "QVector< ::Foo::Bar>";
+    QTest::newRow("template6") << "QVector<::Foo::Bar>" << "QVector<::Foo::Bar>";
+    QTest::newRow("template7") << "QVector<QVector<int> >" << "QVector<QVector<int> >";
     QTest::newRow("template8") << "QMap<const int, const short*>" << "QMap<const int,const short*>";
     QTest::newRow("template9") << "QPair<const QPair<int, int const *> , QPair<QHash<int, const char*>  >  >" << "QPair<const QPair<int,const int*>,QPair<QHash<int,const char*> > >";
     QTest::newRow("value1") << "const QString &" << "QString";
@@ -1387,6 +1388,7 @@ void tst_QMetaObject::normalizedType_data()
     QTest::newRow("struct2") << "struct foo const*" << "const foo*";
     QTest::newRow("enum") << "enum foo" << "foo";
     QTest::newRow("void") << "void" << "void";
+    QTest::newRow("QList") << "QList<int>" << "QVector<int>";
 }
 
 void tst_QMetaObject::normalizedType()