Liang Qi 4dd8a63fc1 Merge remote-tracking branch 'origin/5.5.0' into 5.5 ... Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.h Manually fixed src/testlib/qtestcase.cpp to return the right type. Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4		2015-06-27 13:54:35 +02:00
..
access	fix usage of wince scope	2015-06-05 10:29:10 +00:00
bearer	Skip instead of entirely excluding tests with disabled features	2015-03-16 09:34:15 +00:00
kernel	fix usage of wince scope	2015-06-05 10:29:10 +00:00
socket	fix usage of wince scope	2015-06-05 10:29:10 +00:00
ssl	Merge remote-tracking branch 'origin/5.5.0' into 5.5	2015-06-27 13:54:35 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00