Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978		2016-06-21 08:39:41 +02:00
..
certs	ssl: add test for server-side QSslSocket::PeerVerifyMode	2015-02-07 06:51:05 +00:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	tst_qsslsocket::protocolServerSide - blacklist on RHEL 7.2	2016-05-26 10:47:42 +00:00
qsslsocket.pro	QtNetwork: Remove Windows CE.	2016-03-29 20:28:18 +00:00
ssl.tar.gz	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qsslsocket.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00