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
..
qsslcertificate	SSL: blacklist ANSSI intermediate certificate	2013-12-10 15:14:22 +01:00
qsslcipher	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsslerror	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qsslkey	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsslsocket	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00
qsslsocket_onDemandCertificates_member	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
qsslsocket_onDemandCertificates_static	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
ssl.pro	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00