whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/network/ssl
History
Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
 		2015-12-18 08:37:31 +01:00
..
qasn1element Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslcertificate Merge remote-tracking branch 'origin/5.6' into dev 2015-11-04 20:18:14 +01:00
qsslcipher Tests: Remove empty init/cleanup slots, constructors and destructors. 2015-12-10 05:26:05 +00:00
qsslellipticcurve Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslerror Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslkey tests/auto/network: Remove some placeholder formatting. 2015-10-19 12:38:28 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
qsslsocket_onDemandCertificates_member Tests: Remove empty init/cleanup slots, constructors and destructors. 2015-12-10 05:26:05 +00:00
qsslsocket_onDemandCertificates_static Tests: Remove empty init/cleanup slots, constructors and destructors. 2015-12-10 05:26:05 +00:00
ssl.pro Add SecureTransport based SSL backend for iOS and OS X 2015-02-02 14:02:56 +00:00