Liang Qi bf58c70546 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/io/qdir.cpp src/corelib/kernel/qtimer.cpp src/corelib/kernel/qtimer.h Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f		2018-11-22 01:53:29 +01:00
..
access	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-22 01:53:29 +01:00
bearer	Make tests compile for Android	2018-06-25 08:01:19 +00:00
kernel	tst_qnetworkinterface: Fix for case of zero interface	2018-07-06 06:39:36 +00:00
socket	tst_QLocalSocket::processConnections: remove QSKIP	2018-10-25 11:51:48 +00:00
ssl	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-22 01:53:29 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00