Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +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	Remove Nokia-domains in commented-out test code.	2013-07-12 12:41:30 +02: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	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +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