Liang Qi 1c8451bdbb Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/tools/qdoc/tree.cpp tests/auto/gui/painting/qcolor/tst_qcolor.cpp Change-Id: Iaa78f601a63191fa643aabf853520f913f2f0fdc		2015-04-27 21:36:32 +02:00
..
access	Merge remote-tracking branch 'origin/5.5' into dev	2015-04-06 19:10:25 +02:00
bearer	Skip instead of entirely excluding tests with disabled features	2015-03-16 09:34:15 +00:00
kernel	Tests: Blacklist tst_QHostInfo::abortHostLookupInDifferentThread	2015-04-27 11:52:25 +00:00
socket	Merge remote-tracking branch 'origin/5.5' into dev	2015-03-24 07:38:02 +01:00
ssl	Add the ability to prefer the cipher preferences specified by the server.	2015-04-25 12:10:50 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00