Conflicts: src/corelib/io/qiodevice_p.h src/corelib/kernel/qvariant_p.h src/corelib/tools/qsimd.cpp src/gui/kernel/qguiapplication.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a |
||
|---|---|---|
| .. | ||
| platformsocketengine | ||
| qabstractsocket | ||
| qhttpsocketengine | ||
| qlocalsocket | ||
| qsocks5socketengine | ||
| qtcpserver | ||
| qtcpsocket | ||
| qudpsocket | ||
| socket.pro | ||