Frederik Gladhorn 3f3be55835 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qplatformtheme.h tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5		2013-12-16 16:59:33 +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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +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	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00
qtcpsocket	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +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