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
..
qauthenticator	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdnslookup	Update the DNS and name-resolver tests to the official zone	2013-06-07 05:31:31 +02:00
qdnslookup_appless	Update the DNS and name-resolver tests to the official zone	2013-06-07 05:31:31 +02:00
qhostaddress	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00
qhostinfo	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
qnetworkaddressentry	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qnetworkinterface	QNetworkInterface auto test: do not abort without session	2013-03-26 10:18:02 +01:00
qnetworkproxy	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qnetworkproxyfactory	tests: Replace Q_OS_MACX -> Q_OS_OSX	2013-10-21 10:37:56 +02:00
kernel.pro	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00