Simon Hausmann 198606f6db Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/plugins/platforms/xcb/qxcbnativeinterface.cpp src/plugins/platforms/xcb/qxcbnativeinterface.h Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076		2015-03-16 10:31:07 +01:00
..
access	QNetworkAccessManager: Support HTTP redirection	2015-03-09 08:32:14 +00:00
bearer	Update copyright headers	2015-02-11 06:49:51 +00:00
kernel	Add a QHostAddress::toIPv4Address overload taking a bool *ok	2015-03-06 07:53:59 +00:00
socket	Merge remote-tracking branch 'origin/5.5' into dev	2015-03-16 10:31:07 +01:00
ssl	QSslSocket test - adapt 'verifyClientCertificate' for Secure Transport	2015-02-13 20:43:09 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00