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
..
platformsocketengine	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00
qabstractsocket	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qhttpsocketengine	test: tst_qhttpsocketengine requires `private_tests' set	2014-01-15 16:18:47 +01:00
qlocalsocket	Remove trailing space from QDebug stream	2013-12-06 13:33:10 +01:00
qsocks5socketengine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtcpserver	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
qtcpsocket	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
qudpsocket	Merge remote-tracking branch 'origin/stable' into dev	2013-12-16 16:59:33 +01:00
socket.pro	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00