Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62		2015-06-03 10:23:56 +02:00
..
access	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
bearer	Skip instead of entirely excluding tests with disabled features	2015-03-16 09:34:15 +00:00
kernel	Tests: Remove tst_QHostInfo::abortHostLookupInDifferentThread() test	2015-05-13 11:21:14 +00:00
socket	Merge remote-tracking branch 'origin/5.5' into dev	2015-03-24 07:38:02 +01:00
ssl	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00