Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +02:00
..
certs	ssl: add test for server-side QSslSocket::PeerVerifyMode	2015-02-07 06:51:05 +00:00
.gitignore	…
BLACKLIST	tst_qsslsocket::protocolServerSide - blacklist on RHEL 7.2	2016-05-26 10:47:42 +00:00
qsslsocket.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
ssl.tar.gz	…
tst_qsslsocket.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00