diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:07:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:36:44 +0200 |
| commit | dbef41f43ece97d8ac4d6b63f7a36afcb7e7b7f7 (patch) | |
| tree | 334ebaec198a7f31d1e3a4639c70fbb8bb116af2 /tests/auto/network-settings.h | |
| parent | 52d30e2850769d589772576e4714a14241c7da6e (diff) | |
| parent | f57d8f1341587e6b2aa84b8404aa218432584206 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/qtestlib/tutorial5/containers.cpp
examples/widgets/tools/tools.pro
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/network/kernel/qdnslookup_unix.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/testlib/qtestcase.cpp
tools/configure/configureapp.cpp
Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
Diffstat (limited to 'tests/auto/network-settings.h')
| -rw-r--r-- | tests/auto/network-settings.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index d6b63c6100..16966ced4e 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -29,6 +29,8 @@ #include <QString> #ifdef QT_NETWORK_LIB #include <QtNetwork/QHostInfo> +#include <QtNetwork/QHostAddress> +#include <QtNetwork/QAbstractSocket> #endif #ifdef Q_OS_UNIX @@ -134,5 +136,21 @@ public: } return true; } -#endif + + // Helper function for usage with QVERIFY2 on sockets. + static QByteArray msgSocketError(const QAbstractSocket &s) + { + QString result; + QDebug debug(&result); + debug.nospace(); + debug.noquote(); + if (!s.localAddress().isNull()) + debug << "local=" << s.localAddress().toString() << ':' << s.localPort(); + if (!s.peerAddress().isNull()) + debug << ", peer=" << s.peerAddress().toString() << ':' << s.peerPort(); + debug << ", type=" << s.socketType() << ", state=" << s.state() + << ", error=" << s.error() << ": " << s.errorString(); + return result.toLocal8Bit(); + } +#endif // QT_NETWORK_LIB }; |