qt5base-lts/tests/auto/network/ssl/qsslsocket
Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
2015-12-18 08:37:31 +01: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 Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +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 dev 2015-12-18 08:37:31 +01:00