88cf044580
Conflicts: src/gui/kernel/qwindow.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowssystemtrayicon.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp tests/auto/widgets/kernel/qaction/tst_qaction.cpp Change-Id: Ifa515dc0ece7eb1471b00c1214149629a7e6a233 |
||
---|---|---|
.. | ||
platformsocketengine | ||
qabstractsocket | ||
qhttpsocketengine | ||
qlocalsocket | ||
qsctpsocket | ||
qsocks5socketengine | ||
qtcpserver | ||
qtcpsocket | ||
qudpsocket | ||
socket.pro |