qt5base-lts/tests/auto/network/ssl
Liang Qi bc5f45052f Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	src/corelib/global/qconfig-bootstrapped.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qcryptographichash.cpp
	src/corelib/tools/qcryptographichash.h
	src/corelib/tools/qmessageauthenticationcode.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST

Change-Id: Ib68112de985a3d714c2071f47c10e907e4f0229a
2017-10-04 13:41:04 +02:00
..
qasn1element QAsn1Element - fix toDateTime function 2017-07-18 13:09:16 +00:00
qsslcertificate Fix crash when reading a PKCS12 file with no private key 2017-08-17 06:43:49 +00:00
qsslcipher QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qssldiffiehellmanparameters Remove remains of wince in .pro files 2017-07-03 05:32:51 +00:00
qsslellipticcurve QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslerror QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslkey Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.9' into 5.10 2017-09-06 13:26:31 +02:00
qsslsocket_onDemandCertificates_member tst_QSsl(longlongnamefollows) - fix a flakey auto-test 2017-10-03 16:37:30 +00:00
qsslsocket_onDemandCertificates_static Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
ssl.pro remove redundant conditionals regarding ssl 2016-10-04 08:25:24 +00:00