Frederik Gladhorn 3de7382044 Merge remote-tracking branch 'origin/5.4.0' into 5.4 ... Conflicts: dist/changes-5.4.0 7231e1fbe2 went into 5.4 instead of the 5.4.0 branch, thus the conflict. Change-Id: I70b8597ab52506490dcaf700427183950d42cbd1		2014-11-27 18:12:10 +01:00
..
qasn1element	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qsslcertificate	Use camel case in PKCS#12 function	2014-11-24 08:50:05 +01:00
qsslcipher	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qsslerror	Add qHash(QSslError) overload	2014-10-19 07:32:41 +02:00
qsslkey	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qsslsocket	Blacklist one tst_qsslsocket test	2014-11-26 10:47:08 +01:00
qsslsocket_onDemandCertificates_member	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qsslsocket_onDemandCertificates_static	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
ssl.pro	Fix invalid qmake syntax	2014-11-19 10:34:24 +01:00