diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-24 10:37:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-24 13:40:55 +0200 |
| commit | fa9d12f4a20d618caedc77880459fa1af75fd50d (patch) | |
| tree | 11bd3cb4541afb924b3ee17f867133e71eb0e090 /tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp | |
| parent | 895cb4681ee78caaf9b99c88390a74ff1d79ae61 (diff) | |
| parent | f174d31667dca184439f520b9624a1471d9556a6 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/plugins/platforms/xcb/qxcbimage.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/manual/qtabletevent/regular_widgets/main.cpp
Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io>
Done-with: Mårten Nordheim<marten.nordheim@qt.io>
Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30
Diffstat (limited to 'tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp')
| -rw-r--r-- | tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index 99e3d148df..f5c3bfde34 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -156,7 +156,7 @@ void tst_NetworkRemoteStressTest::clearManager() bool nativeLookup(const char *hostname, int port, QByteArray &buf) { -#if !defined(QT_NO_GETADDRINFO) && 0 +#if 0 addrinfo *res = 0; struct addrinfo hints; memset(&hints, 0, sizeof(hints)); |