From 33ffbf21e0a35debd30579e1bd7f55cb5cae37bc Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Fri, 2 Nov 2012 00:04:13 +0100 Subject: [PATCH] Remove qSort usages from SSL code Change-Id: Ie080cd3d0a6ac37fad625759946a71134c989c83 Reviewed-by: Richard J. Moore --- src/network/ssl/qsslsocket_openssl_symbols.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 398a3d447e..eeae9d461f 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -57,6 +57,8 @@ #include #endif +#include + QT_BEGIN_NAMESPACE /* @@ -410,7 +412,7 @@ static QStringList findAllLibSsl() QDir dir(path); QStringList entryList = dir.entryList(QStringList() << QLatin1String("libssl.*"), QDir::Files); - qSort(entryList.begin(), entryList.end(), libGreaterThan); + std::sort(entryList.begin(), entryList.end(), libGreaterThan); foreach (const QString &entry, entryList) foundSsls << path + QLatin1Char('/') + entry; } @@ -427,7 +429,7 @@ static QStringList findAllLibCrypto() QDir dir(path); QStringList entryList = dir.entryList(QStringList() << QLatin1String("libcrypto.*"), QDir::Files); - qSort(entryList.begin(), entryList.end(), libGreaterThan); + std::sort(entryList.begin(), entryList.end(), libGreaterThan); foreach (const QString &entry, entryList) foundCryptos << path + QLatin1Char('/') + entry; }