From 55d90b324031ba26a2c3e401be1e2fe92e896a21 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 12 Jul 2012 16:22:15 +0200 Subject: Don't declare built-in metatypes as metatypes again. Change-Id: Iba9804299e8f6e2db10965fdc719ee26f197758e Reviewed-by: Olivier Goffart --- .../auto/corelib/kernel/qvariant/tst_qvariant.cpp | 23 ---------------------- 1 file changed, 23 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index e1542e0c15..27967fa9e6 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -68,22 +68,6 @@ #include -Q_DECLARE_METATYPE(qlonglong) -Q_DECLARE_METATYPE(qulonglong) -Q_DECLARE_METATYPE(QPointF) -Q_DECLARE_METATYPE(QRectF) -Q_DECLARE_METATYPE(QSize) -Q_DECLARE_METATYPE(QSizeF) -Q_DECLARE_METATYPE(QLine) -Q_DECLARE_METATYPE(QLineF) -Q_DECLARE_METATYPE(QPoint) -Q_DECLARE_METATYPE(QRect) -Q_DECLARE_METATYPE(QPixmap) -Q_DECLARE_METATYPE(QBrush) -Q_DECLARE_METATYPE(QFont) -Q_DECLARE_METATYPE(QColor) -Q_DECLARE_METATYPE(QKeySequence) - class CustomNonQObject; class tst_QVariant : public QObject @@ -299,11 +283,6 @@ private: QVector objectPointerTestData; }; -Q_DECLARE_METATYPE(QDate) -Q_DECLARE_METATYPE(QTime) -Q_DECLARE_METATYPE(QDateTime) -Q_DECLARE_METATYPE(QVariant) - const qlonglong intMax1 = (qlonglong)INT_MAX + 1; const qulonglong uintMax1 = (qulonglong)UINT_MAX + 1; @@ -2703,8 +2682,6 @@ void tst_QVariant::qvariant_cast_QObject_derived() } } -Q_DECLARE_METATYPE(qint8); - void tst_QVariant::convertToQUint8() const { /* qint8. */ -- cgit v1.2.3