Allan Sandfeld Jensen 1fce111809 Merge remote-tracking branch 'origin/5.4' into merge5.5 ... Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3		2015-05-08 13:26:44 +02:00
..
access	Merge remote-tracking branch 'origin/5.4' into merge5.5	2015-05-08 13:26:44 +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	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	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00