AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b5695bd5be
qt5base-lts/tests/auto/network/ssl
History
Liang Qi e32f1a4d61 Merge remote-tracking branch 'origin/5.6' into 5.7 
And blacklisted a few tests in tst_QUdpSocket.

Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtNative.java
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsystemdetection.h
	src/corelib/io/qfileselector.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	tests/auto/network/socket/qudpsocket/BLACKLIST

Task-number: QTBUG-54205
Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
2016-06-20 08:00:26 +02:00
..
qasn1element Updated license headers 2016-01-21 18:55:18 +00:00
qsslcertificate Updated license headers 2016-01-21 18:55:18 +00:00
qsslcipher Updated license headers 2016-01-21 18:55:18 +00:00
qsslellipticcurve Updated license headers 2016-01-21 18:55:18 +00:00
qsslerror Updated license headers 2016-01-21 18:55:18 +00:00
qsslkey Updated license headers 2016-01-21 18:55:18 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
qsslsocket_onDemandCertificates_member Updated license headers 2016-01-21 18:55:18 +00:00
qsslsocket_onDemandCertificates_static Updated license headers 2016-01-21 18:55:18 +00:00
ssl.pro Add SecureTransport based SSL backend for iOS and OS X 2015-02-02 14:02:56 +00:00