summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorJonas M. Gastal <jgastal@profusion.mobi>2012-01-30 13:02:25 -0200
committerQt by Nokia <qt-info@nokia.com>2012-01-31 11:43:40 +0100
commit0e4fac3fbd147abadde32068c2bc930aca465616 (patch)
treec09175a3e7706d63748cccc9dff37dbaf7fb603c /src/network
parentba9302b8a9b6b50f37987261c1ade9af2ade2d3c (diff)
Removing bad ###Qt5 note.
Implementating this would cause massive SC breakage and give little gain. Change-Id: I56a6d302fdd0e8b53d1f9154f3eaf9e1ee429f9d Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qsslsocket.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 5434da7a77..ffc9f3f9fe 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1954,7 +1954,6 @@ void QSslSocketPrivate::setDefaultSupportedCiphers(const QList<QSslCipher> &ciph
*/
QList<QSslCertificate> QSslSocketPrivate::defaultCaCertificates()
{
- // ### Qt5: rename everything containing "caCertificates" to "rootCertificates" or similar
QSslSocketPrivate::ensureInitialized();
QMutexLocker locker(&globalData()->mutex);
return globalData()->config->caCertificates;