Widgets: 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: Ibe8e2ec867afb4051a3c7eef806d9cd86945928b
Reviewed-by: David Faure <david.faure@kdab.com>

38 files changed, 1 insertions, 91 deletions

diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index 73044d083e..09fdd31495 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -50,7 +50,6 @@
 #include <QVBoxLayout>
 #include <QSizeGrip>
 
-Q_DECLARE_METATYPE(QSize)
 
 
 QT_FORWARD_DECLARE_CLASS(QDialog)
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 0f28057998..d40b2b84af 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -1660,7 +1660,6 @@ Q_DECLARE_METATYPE(Operation *)
 Q_DECLARE_METATYPE(SetPage *)
 Q_DECLARE_METATYPE(SetStyle *)
 Q_DECLARE_METATYPE(SetOption *)
-Q_DECLARE_METATYPE(QList<Operation *>)
 
 class TestGroup
 {
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 5321e5b008..dd62715b05 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -309,7 +309,6 @@ typedef QList<ItemDesc> ItemList;
 Q_DECLARE_METATYPE(ItemList);
 
 typedef QList<QSizeF> SizeList;
-Q_DECLARE_METATYPE(SizeList);
 
 
 // This will be called before the first test function is executed.
@@ -2223,7 +2222,6 @@ void tst_QGraphicsGridLayout::defaultStretchFactors()
 }
 
 typedef QList<QRectF> RectList;
-Q_DECLARE_METATYPE(RectList);
 
 void tst_QGraphicsGridLayout::alignment2_data()
 {
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 2d379d3c07..670369a584 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -67,11 +67,7 @@
 #include <float.h>
 #include <QStyleHints>
 
-Q_DECLARE_METATYPE(QList<int>)
-Q_DECLARE_METATYPE(QList<QRectF>)
 Q_DECLARE_METATYPE(QPainterPath)
-Q_DECLARE_METATYPE(QPointF)
-Q_DECLARE_METATYPE(QRectF)
 
 #include "../../../qtest-config.h"
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index eef70b822a..fa9157a5cc 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -1053,8 +1053,6 @@ void tst_QGraphicsLinearLayout::itemSpacing()
  */
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
-Q_DECLARE_METATYPE(qreal)
 
 void tst_QGraphicsLinearLayout::setStretchFactor_data()
 {
diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
index d07b919a4d..5b82048867 100644
--- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
@@ -370,7 +370,6 @@ void tst_QGraphicsPixmapItem::shape()
 }
 
 Q_DECLARE_METATYPE(SubQGraphicsPixmapItem::Extension)
-Q_DECLARE_METATYPE(QVariant)
 void tst_QGraphicsPixmapItem::extension_data()
 {
     QTest::addColumn<QVariant>("variant");
diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
index bc091a08be..4cb651c479 100644
--- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
@@ -44,7 +44,6 @@
 #include <qgraphicsitem.h>
 #include <qpen.h>
 
-Q_DECLARE_METATYPE(QPolygonF)
 
 class tst_QGraphicsPolygonItem : public QObject
 {
@@ -292,7 +291,6 @@ void tst_QGraphicsPolygonItem::shape()
     QCOMPARE(item.shape(), shape);
 }
 
-Q_DECLARE_METATYPE(QVariant)
 void tst_QGraphicsPolygonItem::extension_data()
 {
     QTest::addColumn<QVariant>("variant");
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 0a832957ea..79459cd4b6 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -2747,7 +2747,6 @@ void tst_QGraphicsProxyWidget::autoShow()
 
 }
 
-Q_DECLARE_METATYPE(QList<QRectF>)
 void tst_QGraphicsProxyWidget::windowOpacity()
 {
     QGraphicsScene scene;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 586dfedbf9..af21e88598 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -63,12 +63,8 @@
 #define Q_CHECK_PAINTEVENTS
 #endif
 
-Q_DECLARE_METATYPE(QList<int>)
-Q_DECLARE_METATYPE(QList<QRectF>)
-Q_DECLARE_METATYPE(QMatrix)
+Q_DECLARE_METATYPE(Qt::FocusReason)
 Q_DECLARE_METATYPE(QPainterPath)
-Q_DECLARE_METATYPE(QPointF)
-Q_DECLARE_METATYPE(QRectF)
 Q_DECLARE_METATYPE(Qt::AspectRatioMode)
 Q_DECLARE_METATYPE(Qt::ItemSelectionMode)
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 6521710fb8..7e7ec4f313 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -69,13 +69,7 @@
 
 #include "../../../qtest-config.h"
 
-Q_DECLARE_METATYPE(QList<int>)
-Q_DECLARE_METATYPE(QList<QRectF>)
-Q_DECLARE_METATYPE(QMatrix)
 Q_DECLARE_METATYPE(QPainterPath)
-Q_DECLARE_METATYPE(QPointF)
-Q_DECLARE_METATYPE(QPolygonF)
-Q_DECLARE_METATYPE(QRectF)
 Q_DECLARE_METATYPE(Qt::ScrollBarPolicy)
 
 #ifdef Q_OS_MAC
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
index 2a66ce32db..3149937bdc 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
@@ -45,12 +45,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>
 
-Q_DECLARE_METATYPE(QList<int>)
-Q_DECLARE_METATYPE(QList<QRectF>)
-Q_DECLARE_METATYPE(QMatrix)
 Q_DECLARE_METATYPE(QPainterPath)
-Q_DECLARE_METATYPE(QPointF)
-Q_DECLARE_METATYPE(QRectF)
 Q_DECLARE_METATYPE(Qt::ScrollBarPolicy)
 
 static void _scrollBarRanges_data_1(int offset)
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 901bb7c38a..841e2e900c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -1891,7 +1891,6 @@ enum WhichSize {
 typedef QPair<int, QVariant> Inst;
 
 Q_DECLARE_METATYPE(Inst)
-Q_DECLARE_METATYPE(QVector<Inst>)
 
 void tst_QGraphicsWidget::setSizes_data()
 {
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index b068413632..38fd50bbf8 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -989,7 +989,6 @@ public:
 };
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
 
 void tst_QAbstractItemView::setItemDelegate_data()
 {
diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
index b7bd005ca3..e602438475 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
@@ -121,10 +121,6 @@ void tst_QDirModel::getSetCheck()
     QCOMPARE(true, obj1.lazyChildCount());
 }
 
-
-Q_DECLARE_METATYPE(QModelIndex)
-Q_DECLARE_METATYPE(QModelIndexList)
-
 void tst_QDirModel::cleanupTestCase()
 {
     QDir current;
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index e6181158fe..562bd6607c 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -56,10 +56,8 @@
 #include <qdebug.h>
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
 
 typedef QList<bool> BoolList;
-Q_DECLARE_METATYPE(BoolList)
 
 class protected_QHeaderView : public QHeaderView
 {
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 248c212ee2..2f7b72fefa 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -928,7 +928,6 @@ public:
 };
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
 
 void tst_QListView::selection_data()
 {
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index 343428cf97..2178bafd6d 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -166,8 +166,6 @@ private:
 
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
-Q_DECLARE_METATYPE(QVariantList)
 
 tst_QListWidget::tst_QListWidget(): testWidget(0), rcParent(8), rcFirst(8,0), rcLast(8,0)
 {
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 9038ae3b00..74511fc87d 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -54,10 +54,8 @@
 #endif
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
 
 typedef QList<bool> BoolList;
-Q_DECLARE_METATYPE(BoolList)
 
 class tst_QTableView : public QObject
 {
@@ -787,7 +785,6 @@ void tst_QTableView::headerSections()
 }
 
 typedef QPair<int,int> IntPair;
-Q_DECLARE_METATYPE(IntPair)
 
 void tst_QTableView::moveCursor_data()
 {
@@ -1849,7 +1846,6 @@ void tst_QTableView::selectColumn()
         QCOMPARE(view.selectionModel()->selectedIndexes().at(i).column(), column);
 }
 
-Q_DECLARE_METATYPE(QRect)
 void tst_QTableView::visualRect_data()
 {
     QTest::addColumn<int>("rowCount");
@@ -2925,7 +2921,6 @@ void tst_QTableView::span()
 }
 
 typedef QVector<QRect> SpanList;
-Q_DECLARE_METATYPE(SpanList)
 
 void tst_QTableView::spans_data()
 {
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index 2d65561484..941e17a922 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -110,10 +110,7 @@ typedef QPair<int, int> IntPair;
 typedef QList<int> IntList;
 typedef QList<IntPair> IntIntList;
 
-Q_DECLARE_METATYPE(IntList)
-Q_DECLARE_METATYPE(IntIntList)
 Q_DECLARE_METATYPE(QTableWidgetSelectionRange)
-Q_DECLARE_METATYPE(QModelIndex)
 
 
 // Testing get/set functions
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 1154ea5ba7..c4c8c348ff 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -45,7 +45,6 @@
 #include <QtWidgets/QtWidgets>
 #include <private/qabstractitemview_p.h>
 
-Q_DECLARE_METATYPE(QModelIndex)
 #ifndef QT_NO_DRAGANDDROP
 Q_DECLARE_METATYPE(QAbstractItemView::DragDropMode)
 #endif
@@ -1798,7 +1797,6 @@ public:
 };
 
 typedef QList<QPoint> PointList;
-Q_DECLARE_METATYPE(PointList)
 
 void tst_QTreeView::setSelection_data()
 {
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index fa57da0d5d..64265ca4b3 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -215,9 +215,6 @@ void tst_QTreeWidget::getSetCheck()
 typedef QList<int> IntList;
 typedef QList<IntList> ListIntList;
 
-Q_DECLARE_METATYPE(IntList)
-Q_DECLARE_METATYPE(ListIntList)
-Q_DECLARE_METATYPE(QModelIndex)
 Q_DECLARE_METATYPE(Qt::Orientation)
 
 typedef QTreeWidgetItem TreeItem;
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index dc7318ca64..81e42fbe42 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -513,7 +513,6 @@ int Qt42Style::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0
 
 
 typedef QList<QPoint> PointList;
-Q_DECLARE_METATYPE(PointList)
 
 
 class SizeHinterFrame : public QLabel
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index dd209e5b59..a24f69b35e 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -4311,8 +4311,6 @@ void tst_QWidget::qobject_castInDestroyedSlot()
     QVERIFY(checker.wasQWidget == true);
 }
 
-Q_DECLARE_METATYPE(QList<QRect>)
-
 // Since X11 WindowManager operations are all async, and we have no way to know if the window
 // manager has finished playing with the window geometry, this test can't be reliable on X11.
 
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
index 548d5b7c26..50d24a6b9f 100644
--- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
@@ -113,7 +113,6 @@ private:
 };
 
 Q_DECLARE_METATYPE(QList<Qt::Key>)
-Q_DECLARE_METATYPE(QPoint)
 
 void tst_QAbstractSlider::initTestCase()
 {
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 7af2b40ee5..e9340eb6da 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -371,8 +371,6 @@ void tst_QComboBox::getSetCheck()
 typedef QList<QVariant> VariantList;
 typedef QList<QIcon> IconList;
 
-Q_DECLARE_METATYPE(VariantList)
-Q_DECLARE_METATYPE(IconList)
 Q_DECLARE_METATYPE(QComboBox::InsertPolicy)
 
 tst_QComboBox::tst_QComboBox()
@@ -1726,7 +1724,6 @@ void tst_QComboBox::findText()
 
 typedef QList<int> IntList;
 typedef QList<Qt::Key> KeyList;
-Q_DECLARE_METATYPE(IntList)
 Q_DECLARE_METATYPE(KeyList)
 
 void tst_QComboBox::flaggedItems_data()
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index ad3d57f9c0..3d78fb96e2 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -53,8 +53,6 @@
 #include <QGridLayout>
 #include <QPainter>
 
-Q_DECLARE_METATYPE(QCommandLinkButton*)
-
 class tst_QCommandLinkButton : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index 1ef1eb6170..269440e37e 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -93,13 +93,9 @@
 #endif
 
 
-Q_DECLARE_METATYPE(QDate);
 Q_DECLARE_METATYPE(Qt::Key);
 Q_DECLARE_METATYPE(Qt::KeyboardModifiers);
 Q_DECLARE_METATYPE(Qt::KeyboardModifier);
-Q_DECLARE_METATYPE(QDateTime);
-Q_DECLARE_METATYPE(QTime);
-Q_DECLARE_METATYPE(QList<int>);
 
 #if defined(Q_OS_WINCE)
 #ifndef SPI_GETPLATFORMTYPE
@@ -291,9 +287,6 @@ private:
 typedef QList<QTime> TimeList;
 typedef QList<Qt::Key> KeyList;
 
-Q_DECLARE_METATYPE(TimeList)
-Q_DECLARE_METATYPE(KeyList)
-
 // Testing get/set functions
 void tst_QDateTimeEdit::getSetCheck()
 {
@@ -3449,9 +3442,7 @@ void tst_QDateTimeEdit::deleteCalendarWidget()
 typedef QPair<Qt::Key, Qt::KeyboardModifier> KeyPair;
 typedef QList<KeyPair> KeyPairList;
 
-Q_DECLARE_METATYPE(QLocale)
 Q_DECLARE_METATYPE(KeyPair)
-Q_DECLARE_METATYPE(KeyPairList)
 
 static inline KeyPair key(Qt::Key key, Qt::KeyboardModifier modifier = Qt::NoModifier) {
     return KeyPair(key, modifier);
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 74b30039f8..e6f5a5aa02 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -47,11 +47,9 @@
 #include <qdialogbuttonbox.h>
 #include <limits.h>
 
-Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QDialogButtonBox::ButtonRole)
 Q_DECLARE_METATYPE(QDialogButtonBox::StandardButton)
 Q_DECLARE_METATYPE(QDialogButtonBox::StandardButtons)
-Q_DECLARE_METATYPE(QAbstractButton*)
 
 class tst_QDialogButtonBox : public QObject
 {
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index 59f6ea46e9..2fbb6c031f 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -155,7 +155,6 @@ private:
 };
 
 typedef QList<double> DoubleList;
-Q_DECLARE_METATYPE(DoubleList)
 
 tst_QDoubleSpinBox::tst_QDoubleSpinBox()
 
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 133a8fa578..b180282a0f 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -318,7 +318,6 @@ private:
 };
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
 Q_DECLARE_METATYPE(QLineEdit::EchoMode)
 
 // Testing get/set functions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index ba5c461223..e03d2de530 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -67,8 +67,6 @@ static const Qt::WindowFlags DefaultWindowFlags
       | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint;
 
 Q_DECLARE_METATYPE(QMdiArea::WindowOrder)
-Q_DECLARE_METATYPE(QMdiSubWindow *)
-Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QTabWidget::TabPosition)
 
 static bool tabBetweenSubWindowsIn(QMdiArea *mdiArea, int tabCount = -1, bool reverse = false)
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index 836333ceb1..8ffc22ed9a 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -65,9 +65,7 @@
 //Used in copyAvailable
 typedef QPair<Qt::Key, Qt::KeyboardModifier> keyPairType;
 typedef QList<keyPairType> pairListType;
-Q_DECLARE_METATYPE(pairListType);
 Q_DECLARE_METATYPE(keyPairType);
-Q_DECLARE_METATYPE(QList<bool>);
 
 QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
 
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index 9d16393861..372b883479 100644
--- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -54,8 +54,6 @@
 #include <QStyleFactory>
 #include <QTabWidget>
 
-Q_DECLARE_METATYPE(QPushButton*)
-
 class tst_QPushButton : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index 6e1abb9fa9..1cdf552bb3 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -148,8 +148,6 @@ private:
 };
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
-Q_DECLARE_METATYPE(QLocale)
 
 // Testing get/set functions
 void tst_QSpinBox::getSetCheck()
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index 7f2033f527..4bd4403bf9 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -168,7 +168,6 @@ void tst_QSplitter::cleanupTestCase()
 
 
 typedef QList<int> IntList;
-Q_DECLARE_METATYPE(IntList)
 
 void tst_QSplitter::setSizes()
 {
diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
index ed1f26734d..a52ef0e6a0 100644
--- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
@@ -435,7 +435,6 @@ void tst_QTabBar::tabButton()
 
 typedef QList<int> IntList;
 Q_DECLARE_METATYPE(QTabBar::SelectionBehavior)
-Q_DECLARE_METATYPE(IntList)
 #define ONE(x) (IntList() << x)
 void tst_QTabBar::selectionBehaviorOnRemove_data()
 {
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index d7a95a8e63..0531126b5b 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -73,10 +73,7 @@
 //Used in copyAvailable
 typedef QPair<Qt::Key, Qt::KeyboardModifier> keyPairType;
 typedef QList<keyPairType> pairListType;
-Q_DECLARE_METATYPE(pairListType);
 Q_DECLARE_METATYPE(keyPairType);
-Q_DECLARE_METATYPE(QList<bool>);
-Q_DECLARE_METATYPE(QList<int>);
 
 QT_FORWARD_DECLARE_CLASS(QTextEdit)
 
diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
index ce4791808b..a52e6788b9 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
@@ -117,8 +117,6 @@ void tst_QToolButton::getSetCheck()
     delete var4;
 }
 
-Q_DECLARE_METATYPE(QAction*)
-
 void tst_QToolButton::triggered()
 {
     qRegisterMetaType<QAction *>("QAction *");