Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
access	Skip instead of entirely excluding tests with disabled features	2015-03-16 09:34:15 +00:00
bearer	Skip instead of entirely excluding tests with disabled features	2015-03-16 09:34:15 +00:00
kernel	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
socket	Remove the tests for Ubuntu Oneiric (11.10)	2015-03-17 01:26:13 +00:00
ssl	Remove the tests for Ubuntu Oneiric (11.10)	2015-03-17 01:26:13 +00:00
network.pro