Frederik Gladhorn a9c88c1f39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444		2014-02-12 16:28:07 +01:00
..
qabstractnetworkcache	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
qftp	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00
qhttpnetworkconnection	network tests: do not rely on external servers	2014-02-11 16:03:02 +01:00
qhttpnetworkreply	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qnetworkaccessmanager	QNetworkAccessManager: track online / accessible state without session	2013-04-02 10:46:23 +02:00
qnetworkcachemetadata	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
qnetworkcookie	tests: Fix some more old references and links to Nokia	2013-02-01 15:27:37 +01:00
qnetworkcookiejar	QNetworkCookie: allow cookies for IPv6 domains	2013-12-13 09:44:25 +01:00
qnetworkdiskcache	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
qnetworkreply	Add more specific HTTP error codes to QNetworkReply::NetworkError	2014-01-30 07:56:47 +01:00
qnetworkrequest	tests: Fix some more old references and links to Nokia	2013-02-01 15:27:37 +01:00
access.pro	test: QFtp tests require `private_tests' set	2012-09-09 08:51:05 +02:00