Conflicts: src/corelib/io/qstorageinfo_unix.cpp src/plugins/platforms/windows/qwindowsmousehandler.cpp src/widgets/styles/qwindowsvistastyle.cpp Change-Id: Ie1725933815891cc8c86258d4c0e8ed0ab386edf |
||
|---|---|---|
| .. | ||
| platformsocketengine | ||
| qabstractsocket | ||
| qhttpsocketengine | ||
| qlocalsocket | ||
| qsocks5socketengine | ||
| qtcpserver | ||
| qtcpsocket | ||
| qudpsocket | ||
| socket.pro | ||