diff options
Diffstat (limited to 'tests/auto/network')
8 files changed, 3 insertions, 26 deletions
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp index fb898c4b89..d35173298c 100644 --- a/tests/auto/network/access/qftp/tst_qftp.cpp +++ b/tests/auto/network/access/qftp/tst_qftp.cpp @@ -57,10 +57,6 @@ #include "../../../network-settings.h" -#ifndef QT_NO_BEARERMANAGEMENT -Q_DECLARE_METATYPE(QNetworkConfiguration) -#endif - class tst_QFtp : public QObject { Q_OBJECT diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index f9f3b26898..8de5174739 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -746,7 +746,6 @@ void tst_QHttpNetworkConnection::ignoresslerror() #endif #ifdef QT_NO_SSL -Q_DECLARE_METATYPE(QNetworkReply::NetworkError) void tst_QHttpNetworkConnection::nossl_data() { QTest::addColumn<QString>("protocol"); diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 9b43185384..a7ac2661d5 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -78,7 +78,10 @@ #include <QtNetwork/private/qnetworksession_p.h> #endif #ifdef QT_BUILD_INTERNAL +#include <QtNetwork/private/qnetworkreplyimpl_p.h> // implicitly included by qnetworkaccessmanager_p.h currently, but don't rely on that being true forever #include <QtNetwork/private/qnetworkaccessmanager_p.h> +#else +Q_DECLARE_METATYPE(QSharedPointer<char>) #endif #ifdef Q_OS_UNIX @@ -89,19 +92,12 @@ #include "../../../network-settings.h" -Q_DECLARE_METATYPE(QSharedPointer<char>) Q_DECLARE_METATYPE(QNetworkReply*) Q_DECLARE_METATYPE(QAuthenticator*) -Q_DECLARE_METATYPE(QNetworkProxy) Q_DECLARE_METATYPE(QNetworkProxyQuery) -Q_DECLARE_METATYPE(QList<QNetworkProxy>) -Q_DECLARE_METATYPE(QNetworkReply::NetworkError) Q_DECLARE_METATYPE(QBuffer*) Q_DECLARE_METATYPE(QHttpMultiPart *) Q_DECLARE_METATYPE(QList<QFile*>) // for multiparts -#ifndef QT_NO_SSL -Q_DECLARE_METATYPE(QSslConfiguration) -#endif typedef QSharedPointer<QNetworkReply> QNetworkReplyPtr; diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index 5980e5fbdc..0ed1dfc8cd 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -57,7 +57,6 @@ QT_USE_NAMESPACE //#define QNETWORKSESSION_MANUAL_TESTS 1 #ifndef QT_NO_BEARERMANAGEMENT -Q_DECLARE_METATYPE(QNetworkConfiguration) Q_DECLARE_METATYPE(QNetworkConfiguration::Type) #endif diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index c32699f224..265c0fecbb 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -55,9 +55,6 @@ #include <QNetworkRequest> #include <QList> -Q_DECLARE_METATYPE(QNetworkConfiguration); -Q_DECLARE_METATYPE(QList<QNetworkProxy>); - #include <QThread> class tst_QNetworkProxyFactory : public QObject { diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index afda020d4d..874bd137c0 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -68,8 +68,6 @@ #include <qhostinfo.h> #include <QNetworkProxy> -Q_DECLARE_METATYPE(QNetworkProxy) -Q_DECLARE_METATYPE(QList<QNetworkProxy>) #include <QNetworkSession> #include <QNetworkConfiguration> diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index e214107b28..d8df5d344d 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -92,11 +92,6 @@ #include "../../../network-settings.h" -Q_DECLARE_METATYPE(QAbstractSocket::SocketError) -Q_DECLARE_METATYPE(QAbstractSocket::SocketState) -Q_DECLARE_METATYPE(QNetworkProxy) -Q_DECLARE_METATYPE(QList<QNetworkProxy>) - QT_FORWARD_DECLARE_CLASS(QTcpSocket) class SocketPair; diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 22ce512cf9..725dc2a653 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -63,15 +63,12 @@ #include "../../../network-settings.h" -Q_DECLARE_METATYPE(QAbstractSocket::SocketState) -Q_DECLARE_METATYPE(QAbstractSocket::SocketError) #ifndef QT_NO_SSL Q_DECLARE_METATYPE(QSslSocket::SslMode) typedef QList<QSslError::SslError> SslErrorList; Q_DECLARE_METATYPE(SslErrorList) Q_DECLARE_METATYPE(QSslError) Q_DECLARE_METATYPE(QSsl::SslProtocol) -Q_DECLARE_METATYPE(QSslConfiguration) #endif #if defined Q_OS_HPUX && defined Q_CC_GNU |