Qt Forward Merge Bot 75c0ffaf6d Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: examples/network/bearermonitor/CMakeLists.txt examples/network/CMakeLists.txt src/corelib/tools/qlinkedlist.h src/sql/kernel/qsqldriver_p.h src/sql/kernel/qsqlresult_p.h src/widgets/kernel/qwidget.cpp src/widgets/kernel/qwidget_p.h tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/tools/moc/allmocs_baseline_in.json Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9		2020-02-26 18:39:21 +01:00
..
platformsocketengine	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-26 18:39:21 +01:00
qabstractsocket	Regenerate tests/auto/network/socket	2019-11-13 10:07:36 +00:00
qhttpsocketengine	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qlocalsocket	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
qsctpsocket	Regenerate tests/auto/network/socket	2019-11-13 10:07:36 +00:00
qsocks5socketengine	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qtcpserver	CMake: Fix qtcpserver and qudpsocket tests	2020-02-25 16:19:30 +01:00
qtcpsocket	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-26 18:39:21 +01:00
qudpsocket	CMake: Fix qtcpserver and qudpsocket tests	2020-02-25 16:19:30 +01:00
CMakeLists.txt	cmake: Enable network test	2019-07-29 13:14:55 +00:00
socket.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00