summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/benchmarks/corelib/codecs/qtextcodec/main.cpp1
-rw-r--r--tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp1
-rw-r--r--tests/benchmarks/corelib/tools/qlist/main.cpp1
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp1
-rw-r--r--tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp1
-rw-r--r--tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp5
-rw-r--r--tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp4
-rw-r--r--tests/benchmarks/gui/text/qtext/main.cpp1
8 files changed, 0 insertions, 15 deletions
diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp
index 0dec59513b..de2b585b09 100644
--- a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp
+++ b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp
@@ -42,7 +42,6 @@
#include <QFile>
#include <qtest.h>
-Q_DECLARE_METATYPE(QList<QByteArray>)
Q_DECLARE_METATYPE(QTextCodec *)
class tst_QTextCodec: public QObject
diff --git a/tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index ffcb8e395a..79b9b36040 100644
--- a/tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp
@@ -97,7 +97,6 @@ QVector<DataType> generateData(QString dataSetType, const int length)
return container;
}
-Q_DECLARE_METATYPE(QVector<int>)
void tst_QAlgorithms::stableSort_data()
{
diff --git a/tests/benchmarks/corelib/tools/qlist/main.cpp b/tests/benchmarks/corelib/tools/qlist/main.cpp
index ab0597ccae..02cdad5f2b 100644
--- a/tests/benchmarks/corelib/tools/qlist/main.cpp
+++ b/tests/benchmarks/corelib/tools/qlist/main.cpp
@@ -192,7 +192,6 @@ void removeAll_test(const QList<int> &i10, ushort valueToRemove, int itemsToRemo
QCOMPARE(MyBase::errorCount, 0);
}
-Q_DECLARE_METATYPE(QList<int>);
void tst_QList::removeAll_primitive_data()
{
diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
index 51d5364a30..4fb26f45fb 100644
--- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
+++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
@@ -76,7 +76,6 @@ private slots:
void roundTripVariant_data();
void roundTripVariant();
};
-Q_DECLARE_METATYPE(QVariant)
void tst_QDBusPerformance::initTestCase()
{
diff --git a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
index fe63285352..34c9aac214 100644
--- a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
+++ b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
@@ -42,7 +42,6 @@
#include <qtest.h>
#include <QImage>
-Q_DECLARE_METATYPE(QImage)
class tst_QImageConversion : public QObject
{
diff --git a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
index ea883cc50b..f3368d9289 100644
--- a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
@@ -54,13 +54,8 @@
typedef QMap<QString, QString> QStringMap;
typedef QList<int> QIntList;
-Q_DECLARE_METATYPE(QImage)
-Q_DECLARE_METATYPE(QRect)
-Q_DECLARE_METATYPE(QSize)
-Q_DECLARE_METATYPE(QColor)
Q_DECLARE_METATYPE(QStringMap)
Q_DECLARE_METATYPE(QIntList)
-Q_DECLARE_METATYPE(QIODevice *)
class tst_QImageReader : public QObject
{
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
index 43516601d3..6fec8dbca0 100644
--- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
@@ -53,10 +53,6 @@
#include <private/qpixmap_raster_p.h>
-Q_DECLARE_METATYPE(QLine)
-Q_DECLARE_METATYPE(QRect)
-Q_DECLARE_METATYPE(QSize)
-Q_DECLARE_METATYPE(QPoint)
Q_DECLARE_METATYPE(QPainterPath)
Q_DECLARE_METATYPE(QPainter::RenderHint)
Q_DECLARE_METATYPE(QPainter::CompositionMode)
diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp
index 543b9041da..f82514eb89 100644
--- a/tests/benchmarks/gui/text/qtext/main.cpp
+++ b/tests/benchmarks/gui/text/qtext/main.cpp
@@ -50,7 +50,6 @@
#include <QBuffer>
#include <qtest.h>
-Q_DECLARE_METATYPE(QTextDocument*)
Q_DECLARE_METATYPE(QList<QTextLayout::FormatRange>)
class tst_QText: public QObject