From fad281c6e238f75193792031d3092785ad3b6809 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Mon, 7 Feb 2011 15:51:05 +0000 Subject: Fix duplicate definition error As the metatype declaration is now in the qnetworksession header file, it is not needed in the test code (and causes compile error on some platforms) Reviewed-By: Markus Goetz (cherry picked from commit d0d0763f6e0c7709208ad1c573266ee527f6e4ff) --- tests/auto/qnetworksession/test/tst_qnetworksession.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp index 37fc9cd..3315836 100644 --- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp @@ -60,8 +60,6 @@ QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNetworkConfiguration) Q_DECLARE_METATYPE(QNetworkConfiguration::Type); -Q_DECLARE_METATYPE(QNetworkSession::State); -Q_DECLARE_METATYPE(QNetworkSession::SessionError); class tst_QNetworkSession : public QObject { @@ -126,8 +124,6 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur void tst_QNetworkSession::initTestCase() { - qRegisterMetaType("QNetworkSession::State"); - qRegisterMetaType("QNetworkSession::SessionError"); qRegisterMetaType("QNetworkConfiguration"); qRegisterMetaType("QNetworkConfiguration::Type"); -- cgit v0.12