qt5base-lts/tests/auto/network/ssl
Liang Qi cdb56c42fc Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
	mkspecs/features/uikit/xcodebuild.mk
	tests/auto/other/lancelot/tst_lancelot.cpp
	tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
	tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp

Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c
2016-09-29 00:38:01 +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 QSslDiffieHellmanParameters: make fit for release 2016-08-12 12:33:07 +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.7' into 5.8 2016-09-29 00:38:01 +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 Modularize configure.json/.pri 2016-09-15 08:23:53 +00:00