Core: Remove declaration of built-in and automatic metatypes.

These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.

Change-Id: I54523eb854619917123d8816d3cd6c3a1f5b4c55
Reviewed-by: David Faure <david.faure@kdab.com>

26 files changed, 0 insertions, 61 deletions

diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
index 49b7c2b648..e9e3ca9bb9 100644
--- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -774,7 +774,6 @@ void tst_QPropertyAnimation::interpolated()
     }
 }
 
-Q_DECLARE_METATYPE(QVariant)
 
 void tst_QPropertyAnimation::setStartEndValues_data()
 {
diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
index f999f44670..3b410e1c1c 100644
--- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
@@ -50,9 +50,6 @@
 
 #include "../../../qtest-config.h"
 
-Q_DECLARE_METATYPE(QBitArray)
-Q_DECLARE_METATYPE(qint64)
-
 class tst_QDataStream : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
index 0a4378847d..5e3801cd2b 100644
--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
@@ -61,8 +61,6 @@ private slots:
     void setLocale();
 };
 
-Q_DECLARE_METATYPE(QLocale)
-Q_DECLARE_METATYPE(qlonglong)
 
 void tst_QResourceEngine::initTestCase()
 {
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 690846fe67..22a7b61ea5 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -758,7 +758,6 @@ void tst_QSettings::testErrorHandling()
 #endif // !Q_OS_WIN
 }
 
-Q_DECLARE_METATYPE(QVariant)
 Q_DECLARE_METATYPE(QSettings::Status)
 
 #ifdef QT_BUILD_INTERNAL
diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
index b9228cb55a..bcbd257de3 100644
--- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
@@ -57,9 +57,6 @@
 
 #include "../../../network-settings.h"
 
-Q_DECLARE_METATYPE(qlonglong)
-Q_DECLARE_METATYPE(qulonglong)
-Q_DECLARE_METATYPE(QList<int>)
 
 QT_BEGIN_NAMESPACE
 template<> struct QMetaTypeId<QIODevice::OpenModeFlag>
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
index bd4ed633cb..30beffe467 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -123,8 +123,6 @@ void tst_QAbstractProxyModel::qabstractproxymodel()
     model.submit();
 }
 
-Q_DECLARE_METATYPE(QVariant)
-Q_DECLARE_METATYPE(QModelIndex)
 void tst_QAbstractProxyModel::data_data()
 {
     QTest::addColumn<QModelIndex>("proxyIndex");
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
index a58a0ad945..b906afce23 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -114,10 +114,6 @@ typedef QList<int> IntList;
 typedef QPair<int, int> IntPair;
 typedef QList<IntPair> PairList;
 
-Q_DECLARE_METATYPE(PairList)
-Q_DECLARE_METATYPE(QModelIndex)
-Q_DECLARE_METATYPE(QModelIndexList)
-Q_DECLARE_METATYPE(IntList)
 Q_DECLARE_METATYPE(QItemSelection)
 
 class QStreamHelper: public QAbstractItemModel
@@ -1683,9 +1679,6 @@ void tst_QItemSelectionModel::removeColumns()
 typedef QList<IntList> IntListList;
 typedef QPair<IntPair, IntPair> IntPairPair;
 typedef QList<IntPairPair> IntPairPairList;
-Q_DECLARE_METATYPE(IntListList)
-Q_DECLARE_METATYPE(IntPairPair)
-Q_DECLARE_METATYPE(IntPairPairList)
 
 void tst_QItemSelectionModel::modelLayoutChanged_data()
 {
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 9660c28f03..576ef7747c 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -54,11 +54,6 @@ typedef QList<int> IntList;
 typedef QPair<int, int> IntPair;
 typedef QList<IntPair> IntPairList;
 
-Q_DECLARE_METATYPE(IntList)
-Q_DECLARE_METATYPE(IntPair)
-Q_DECLARE_METATYPE(IntPairList)
-Q_DECLARE_METATYPE(QModelIndex)
-
 class tst_QSortFilterProxyModel : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index 24649bf587..a095d1eb59 100644
--- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -572,8 +572,6 @@ void tst_QEventLoop::processEventsExcludeTimers()
     timerReceiver.gotTimerEvent = -1;
 }
 
-Q_DECLARE_METATYPE(QThread*)
-
 namespace DeliverInDefinedOrder {
     enum { NbThread = 3,  NbObject = 500, NbEventQueue = 5, NbEvent = 50 };
 
diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index 46a7a5096f..56a323fcd3 100644
--- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
@@ -396,7 +396,6 @@ void tst_QAlgorithms::sortedList()
     QCOMPARE(list.at(5), 8);
 }
 
-Q_DECLARE_METATYPE(QList<int>)
 
 void tst_QAlgorithms::test_qLowerBound_data()
 {
@@ -615,7 +614,6 @@ void tst_QAlgorithms::stableSortTest()
     }
 }
 
-Q_DECLARE_METATYPE(QVector<int>)
 
 void tst_QAlgorithms::stableSortCorrectnessTest_data()
 {
diff --git a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index 8097ba25c0..d21f847493 100644
--- a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
@@ -99,8 +99,6 @@ private slots:
     void resize();
 };
 
-Q_DECLARE_METATYPE(QBitArray)
-
 void tst_QBitArray::size_data()
 {
     //create the testtable instance and define the elements
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index da597bf627..85757643ce 100644
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -1234,7 +1234,6 @@ void tst_QByteArray::toInt()
     QCOMPARE( number, expectednumber );
 }
 
-Q_DECLARE_METATYPE(qulonglong)
 void tst_QByteArray::toULong_data()
 {
     QTest::addColumn<QByteArray>("str");
diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
index 9978a252bf..9cb37bbec7 100644
--- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
@@ -109,7 +109,6 @@ private:
     QDate invalidDate() const { return QDate(); }
 };
 
-Q_DECLARE_METATYPE(QDate)
 Q_DECLARE_METATYPE(Qt::DateFormat)
 
 void tst_QDate::isNull_data()
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 8da5d2808b..7c26d511c6 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -147,9 +147,6 @@ private:
     QTime invalidTime() const { return QTime(-1, -1, -1); }
 };
 
-Q_DECLARE_METATYPE(QDateTime)
-Q_DECLARE_METATYPE(QDate)
-Q_DECLARE_METATYPE(QTime)
 Q_DECLARE_METATYPE(Qt::TimeSpec)
 Q_DECLARE_METATYPE(Qt::DateFormat)
 
diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
index 5f9c461c94..fc1c3c5733 100644
--- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
@@ -158,8 +158,6 @@ void tst_QEasingCurve::propertyDefaults()
 
 typedef QList<int> IntList;
 typedef QList<qreal> RealList;
-Q_DECLARE_METATYPE(IntList)
-Q_DECLARE_METATYPE(RealList)
 
 void tst_QEasingCurve::valueForProgress_data()
 {
diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index 822f2304bb..9123082fb5 100644
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -1546,9 +1546,6 @@ void tst_QList::constSharedNullComplex() const
     QCOMPARE(liveCount, Complex::getLiveCount());
 }
 
-Q_DECLARE_METATYPE(QList<int>);
-Q_DECLARE_METATYPE(QList<Complex>);
-
 template <class T>
 void generateSetSharableData()
 {
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index ea65236d16..1acad071f7 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -74,8 +74,6 @@ extern "C" DWORD GetThreadLocale(void) {
 #    include <stdlib.h>
 #endif
 
-Q_DECLARE_METATYPE(qlonglong)
-Q_DECLARE_METATYPE(QDate)
 Q_DECLARE_METATYPE(QLocale::FormatType)
 
 class tst_QLocale : public QObject
@@ -957,7 +955,6 @@ void tst_QLocale::formatDate()
     QCOMPARE(l.toString(date, format), result);
 }
 
-Q_DECLARE_METATYPE(QTime)
 
 void tst_QLocale::formatTime_data()
 {
diff --git a/tests/auto/corelib/tools/qrect/tst_qrect.cpp b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
index 3bd6d1dd75..7772a8aa1e 100644
--- a/tests/auto/corelib/tools/qrect/tst_qrect.cpp
+++ b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
@@ -44,10 +44,6 @@
 #include <limits.h>
 #include <qdebug.h>
 
-Q_DECLARE_METATYPE(QRectF)
-Q_DECLARE_METATYPE(QPointF)
-Q_DECLARE_METATYPE(QRect)
-Q_DECLARE_METATYPE(QPoint)
 
 class tst_QRect : public QObject
 {
diff --git a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
index 3d61a847b0..7073805db4 100644
--- a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
+++ b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
@@ -71,7 +71,6 @@ struct Match
 };
 
 Q_DECLARE_METATYPE(Match)
-Q_DECLARE_METATYPE(QList<Match>)
 
 bool operator==(const QRegularExpressionMatch &rem, const Match &m)
 {
diff --git a/tests/auto/corelib/tools/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index b44d7d186e..22f2f0330c 100644
--- a/tests/auto/corelib/tools/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 #include <qsize.h>
 
-Q_DECLARE_METATYPE(QSize)
 
 class tst_QSize : public QObject
 {
diff --git a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
index ee9c5a5778..80ef0355b2 100644
--- a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
+++ b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 #include <qsize.h>
 
-Q_DECLARE_METATYPE(QSizeF)
 
 class tst_QSizeF : public QObject
 {
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index bc6bc585f2..740581ceec 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -67,7 +67,6 @@
 #include <locale.h>
 #include <qhash.h>
 
-Q_DECLARE_METATYPE(qlonglong)
 
 #define CREATE_REF(string)                                              \
     const QString padded = QString::fromLatin1(" %1 ").arg(string);     \
@@ -316,9 +315,6 @@ QString verifyZeroTermination(const QString &str)
 
 typedef QList<int> IntList;
 
-Q_DECLARE_METATYPE(QList<QVariant>)
-Q_DECLARE_METATYPE(IntList)
-
 // This next bit is needed for the NAN and INF in string -> number conversion tests
 #include <float.h>
 #include <limits.h>
diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index df9158da99..c56f12d650 100644
--- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
@@ -46,7 +46,6 @@
 #include <qlocale.h>
 #include <locale.h>
 
-Q_DECLARE_METATYPE(qlonglong)
 
 class tst_QStringRef : public QObject
 {
@@ -84,9 +83,6 @@ static QStringRef emptyRef()
 
 typedef QList<int> IntList;
 
-Q_DECLARE_METATYPE(QList<QVariant>)
-Q_DECLARE_METATYPE(IntList)
-
 // This next bit is needed for the NAN and INF in string -> number conversion tests
 #include <float.h>
 #include <limits.h>
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index b126c62c72..9172c4115e 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -78,7 +78,6 @@ private slots:
     void thaiLineBreak();
 };
 
-Q_DECLARE_METATYPE(QList<int>)
 
 QT_BEGIN_NAMESPACE
 namespace QTest {
diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
index bfb8b4c42d..46b762bac9 100644
--- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
@@ -80,7 +80,6 @@ private:
     QTime invalidTime() { return QTime(-1, -1, -1); }
 };
 
-Q_DECLARE_METATYPE(QTime)
 Q_DECLARE_METATYPE(Qt::DateFormat)
 
 void tst_QTime::addSecs_data()
diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 0eda837644..ecb9d2e9e2 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -296,7 +296,6 @@ private:
     template<typename T> void detach() const;
 };
 
-Q_DECLARE_METATYPE(QVector<int>);
 
 template<typename T> struct SimpleValue
 {