Conflicts: src/corelib/io/qprocess_win.cpp src/widgets/itemviews/qheaderview.cpp Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761 |
||
|---|---|---|
| .. | ||
| platformsocketengine | ||
| qabstractsocket | ||
| qhttpsocketengine | ||
| qlocalsocket | ||
| qsocks5socketengine | ||
| qtcpserver | ||
| qtcpsocket | ||
| qudpsocket | ||
| socket.pro | ||