AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1326cd15f7
qt5base-lts/tests/auto/network/ssl
History
Frederik Gladhorn 1326cd15f7 Merge remote-tracking branch 'origin/stable' into dev 
Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/qgl.cpp
	src/opengl/qglpixelbuffer.cpp
	src/opengl/qglshaderprogram.cpp
	tests/auto/opengl/qglthreads/tst_qglthreads.cpp

Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
2014-05-06 16:50:03 +02:00
..
qsslcertificate Provide new API: QSslCertificate::isSelfSigned() 2014-04-30 01:30:08 +02:00
qsslcipher QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01:00
qsslerror QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01:00
qsslkey QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01:00
qsslsocket Add missing #ifndef QT_NO_SSL 2014-04-25 10:55:31 +02:00
qsslsocket_onDemandCertificates_member QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01:00
qsslsocket_onDemandCertificates_static QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01:00
ssl.pro WinRT: Fixed compilation of network autotests and benchmarks 2013-12-06 15:06:47 +01:00