Liang Qi e918334045 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qfiledialog.cpp tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad		2016-09-28 11:51:35 +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	fix usage of wince scope	2015-06-05 10:29:10 +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.6' into 5.7	2016-09-28 11:51:35 +02:00