summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp7
-rw-r--r--tests/auto/corelib/io/qprocess/tst_qprocess.cpp1
-rw-r--r--tests/auto/other/modeltest/modeltest.cpp2
-rw-r--r--tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp1
-rw-r--r--tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp1
-rw-r--r--tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp1
-rw-r--r--tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp1
-rw-r--r--tests/auto/xml/dom/qdom/tst_qdom.cpp1
-rw-r--r--tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp1
9 files changed, 0 insertions, 16 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index b6bc5b085b..5073d87cb5 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -49,13 +49,6 @@
#include "functions.h"
-Q_DECLARE_METATYPE(QVector<int>);
-Q_DECLARE_METATYPE(QVector<double>);
-Q_DECLARE_METATYPE(QVector<QString>);
-Q_DECLARE_METATYPE(QList<int>);
-Q_DECLARE_METATYPE(QList<double>);
-Q_DECLARE_METATYPE(QList<QString>);
-
class tst_QtConcurrentMap: public QObject
{
Q_OBJECT
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 8f76945bf5..98c12b01c1 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -56,7 +56,6 @@
# include <windows.h>
# endif
-Q_DECLARE_METATYPE(QList<QProcess::ExitStatus>);
Q_DECLARE_METATYPE(QProcess::ExitStatus);
Q_DECLARE_METATYPE(QProcess::ProcessState);
#endif
diff --git a/tests/auto/other/modeltest/modeltest.cpp b/tests/auto/other/modeltest/modeltest.cpp
index 17f164b638..27b1e5aa95 100644
--- a/tests/auto/other/modeltest/modeltest.cpp
+++ b/tests/auto/other/modeltest/modeltest.cpp
@@ -46,8 +46,6 @@
#include <QtTest/QtTest>
-Q_DECLARE_METATYPE ( QModelIndex )
-
/*!
Connect to all of the models signals. Whenever anything happens recheck everything.
*/
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
index b01f311f4f..85ddc41cdf 100644
--- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
@@ -56,7 +56,6 @@
#include <windows.h>
#endif
-Q_DECLARE_METATYPE(QRect)
QT_FORWARD_DECLARE_CLASS(QPrinter)
diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp
index 0ff80c4147..16c0711ee7 100644
--- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp
+++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp
@@ -50,7 +50,6 @@
# include <sys/wait.h>
#endif
-Q_DECLARE_METATYPE(QRect)
class tst_QPrinterInfo : public QObject
{
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index b66bec170a..a3341fff24 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -49,7 +49,6 @@ const QString test(qTableName("test", __FILE__)),
test2(qTableName("test2", __FILE__)),
test3(qTableName("test3", __FILE__));
-Q_DECLARE_METATYPE(QModelIndex)
class tst_QSqlTableModel : public QObject
{
diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
index 457be3fddd..572388df6c 100644
--- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
@@ -166,7 +166,6 @@ void tst_Cmptest::compare_pointerfuncs()
QCOMPARE(&i, intptr());
}
-Q_DECLARE_METATYPE(QVariant)
struct PhonyClass
{
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index 1b32aad5f2..540c242485 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -143,7 +143,6 @@ private:
QList<QByteArray> m_testCodecs;
};
-Q_DECLARE_METATYPE(QList<QVariant>)
void tst_QDom::setContent_data()
{
diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
index 98e2d0b2ac..4c05c64126 100644
--- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
+++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
@@ -74,7 +74,6 @@ typedef int SOCKET;
# include <winsock2.h>
#endif
-Q_DECLARE_METATYPE(QVector<QUrl>)
class tst_NetworkRemoteStressTest : public QObject
{