Liang Qi f8246099ea Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/corelib/io/qstorageinfo_unix.cpp src/plugins/platforms/windows/qwindowsmousehandler.cpp src/widgets/styles/qwindowsvistastyle.cpp Change-Id: Ie1725933815891cc8c86258d4c0e8ed0ab386edf		2015-11-04 12:28:48 +01:00
..
access	Don't let closed http sockets pass as valid connections	2015-10-13 16:40:56 +00:00
bearer	tests/auto/network: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 04:29:33 +00:00
kernel	Autotest: Make tst_QNetworkInterface::interfaceFromXXX data-driven	2015-09-13 18:54:10 +00:00
socket	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-11-04 12:28:48 +01:00
ssl	Disable tst_QSslCertificate::subjectAndIssuerAttributes completely	2015-10-29 10:13:57 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00