AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73cc3db4d5
qt5base-lts/tests/auto/network/ssl
History
Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
2015-06-03 10:23:56 +02:00
..
qasn1element Update copyright headers 2015-02-11 06:49:51 +00:00
qsslcertificate Update copyright headers 2015-02-11 06:49:51 +00:00
qsslcipher Update copyright headers 2015-02-11 06:49:51 +00:00
qsslellipticcurve Update copyright headers 2015-02-11 06:49:51 +00:00
qsslerror Update copyright headers 2015-02-11 06:49:51 +00:00
qsslkey Update copyright headers 2015-02-11 06:49:51 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
qsslsocket_onDemandCertificates_member Update copyright headers 2015-02-11 06:49:51 +00:00
qsslsocket_onDemandCertificates_static Update copyright headers 2015-02-11 06:49:51 +00:00
ssl.pro Add SecureTransport based SSL backend for iOS and OS X 2015-02-02 14:02:56 +00:00