Frederik Gladhorn 3de7382044 Merge remote-tracking branch 'origin/5.4.0' into 5.4 ... Conflicts: dist/changes-5.4.0 7231e1fbe2 went into 5.4 instead of the 5.4.0 branch, thus the conflict. Change-Id: I70b8597ab52506490dcaf700427183950d42cbd1		2014-11-27 18:12:10 +01:00
..
access	Blacklist one test function in tst_QNetworkReply	2014-11-21 16:48:44 +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.0' into 5.4	2014-11-27 18:12:10 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00