Liang Qi c2b224a758 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qprocess_unix.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/util/util.pri tests/auto/corelib/thread/qthread/qthread.pro tests/auto/corelib/thread/qthread/tst_qthread.cpp Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b		2017-07-04 16:05:53 +02:00
..
access	Fix some MSVC warnings in tests	2017-06-28 17:58:13 +00:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-04 16:05:53 +02:00
socket	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-04 16:05:53 +02:00
ssl	QSSLSocket::readData return -1 when socket is not connected	2017-06-08 04:00:54 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00