Liang Qi 6bc1ce9c16 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/corelib/kernel/qcfsocketnotifier.cpp src/tools/qdoc/qdocindexfiles.cpp Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a		2015-10-23 23:14:22 +02:00
..
BLACKLIST	Tests: Use blacklist for tst_NetworkSelfTest::ftpProxyServer()	2015-10-22 13:45:09 +00:00
networkselftest.pro	Tests: Use blacklist for tst_NetworkSelfTest::ftpProxyServer()	2015-10-22 13:45:09 +00:00
tst_networkselftest.cpp	Various tests: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-28 13:18:55 +00:00