Simon Hausmann 015002fec9 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61		2014-12-10 07:58:06 +01:00
..
access	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
bearer	update QtBearer NetworkManager backend API	2014-10-21 01:01:06 +02:00
kernel	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00
socket	Mark QSocks5SocketEngine tests blacklisted	2014-11-21 16:48:20 +01:00
ssl	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00