diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-02-07 15:51:05 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-09 07:23:29 (GMT) |
| commit | fad281c6e238f75193792031d3092785ad3b6809 (patch) | |
| tree | 4721f50ebe2786b975c6e44ab85adb254e6c91a0 | |
| parent | 818b5cd57d0f597423511da9e9e9da6f0f5cf782 (diff) | |
| download | Qt-fad281c6e238f75193792031d3092785ad3b6809.zip Qt-fad281c6e238f75193792031d3092785ad3b6809.tar.gz Qt-fad281c6e238f75193792031d3092785ad3b6809.tar.bz2 | |
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)
| -rw-r--r-- | tests/auto/qnetworksession/test/tst_qnetworksession.cpp | 4 |
1 files changed, 0 insertions, 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>("QNetworkSession::State"); - qRegisterMetaType<QNetworkSession::SessionError>("QNetworkSession::SessionError"); qRegisterMetaType<QNetworkConfiguration>("QNetworkConfiguration"); qRegisterMetaType<QNetworkConfiguration::Type>("QNetworkConfiguration::Type"); |