qt5base-lts/tests/auto/network/ssl
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
qasn1element Update copyright headers 2015-02-11 06:49:51 +00:00
qsslcertificate fix usage of wince scope 2015-06-05 10:29:10 +00:00
qsslcipher fix usage of wince scope 2015-06-05 10:29:10 +00:00
qsslellipticcurve Merge remote-tracking branch 'origin/5.5.0' into 5.5 2015-06-27 13:54:35 +02:00
qsslerror fix usage of wince scope 2015-06-05 10:29:10 +00:00
qsslkey Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
qsslsocket Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
qsslsocket_onDemandCertificates_member Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
qsslsocket_onDemandCertificates_static Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
ssl.pro Add SecureTransport based SSL backend for iOS and OS X 2015-02-02 14:02:56 +00:00