96232be146
Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296 |
||
---|---|---|
.. | ||
platformsocketengine | ||
qabstractsocket | ||
qhttpsocketengine | ||
qlocalsocket | ||
qsocks5socketengine | ||
qtcpserver | ||
qtcpsocket | ||
qudpsocket | ||
socket.pro |