qt5base-lts/tests/auto/network/ssl
Liang Qi 9419dfe8ee Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
2017-04-04 18:09:33 +02:00
..
qasn1element Updated license headers 2016-01-21 18:55:18 +00:00
qsslcertificate QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslcipher QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qssldiffiehellmanparameters Network: Use canonical license headers 2017-02-28 15:34:01 +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 dev 2017-04-04 18:09:33 +02:00
qsslsocket_onDemandCertificates_member Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +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