diff options
Diffstat (limited to 'src/testlib/qtest.h')
-rw-r--r-- | src/testlib/qtest.h | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 63e79c777f..b9bb10818e 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -58,10 +58,6 @@ #include <QtCore/qsize.h> #include <QtCore/qrect.h> -#ifdef QT_NETWORK_LIB -# include <QtNetwork/qhostaddress.h> -#endif - QT_BEGIN_NAMESPACE @@ -192,26 +188,6 @@ template<> inline char *toString(const QVariant &v) return qstrdup(vstring.constData()); } -#ifdef QT_NETWORK_LIB -/*! - \internal - */ -template<> inline char *toString(const QHostAddress &addr) -{ - switch (addr.protocol()) { - case QAbstractSocket::UnknownNetworkLayerProtocol: - return qstrdup("<unknown address (parse error)>"); - case QAbstractSocket::AnyIPProtocol: - return qstrdup("QHostAddress::Any"); - case QAbstractSocket::IPv4Protocol: - case QAbstractSocket::IPv6Protocol: - break; - } - - return qstrdup(addr.toString().toLatin1().constData()); -} -#endif - inline char *toString(std::nullptr_t) { return toString(QLatin1String("nullptr")); @@ -357,6 +333,10 @@ int main(int argc, char *argv[]) \ # define QTEST_ADD_GPU_BLACKLIST_SUPPORT #endif +#if defined(QT_NETWORK_LIB) +# include <QtTest/qtest_network.h> +#endif + #if defined(QT_WIDGETS_LIB) #include <QtTest/qtest_widgets.h> |