Liang Qi 4456984da7 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e		2015-10-14 15:45:35 +02:00
..
access	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
bearer	tests/auto/network: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 04:29:33 +00:00
kernel	Tests: Fix single-character string literals.	2015-10-13 18:14:27 +00:00
socket	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
ssl	Tests: Use QCOMPARE() with QLatin1String() for QString values.	2015-10-14 08:32:42 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00