AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove qSort usages from SSL code

Browse Source 
Change-Id: Ie080cd3d0a6ac37fad625759946a71134c989c83
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Giuseppe D'Angelo 2012-11-02 00:04:13 +01:00 committed by The Qt Project
parent 6e7ab54862
commit 33ffbf21e0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/ssl/qsslsocket_openssl_symbols.cpp
View File

@ -57,6 +57,8 @@
#include <link.h> #include <link.h>
#endif #endif
#include <algorithm>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
/* /*
@ -410,7 +412,7 @@ static QStringList findAllLibSsl()
QDir dir(path); QDir dir(path);
QStringList entryList = dir.entryList(QStringList() << QLatin1String("libssl.*"), QDir::Files); 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) foreach (const QString &entry, entryList)
foundSsls << path + QLatin1Char('/') + entry; foundSsls << path + QLatin1Char('/') + entry;
} }
@ -427,7 +429,7 @@ static QStringList findAllLibCrypto()
QDir dir(path); QDir dir(path);
QStringList entryList = dir.entryList(QStringList() << QLatin1String("libcrypto.*"), QDir::Files); 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) foreach (const QString &entry, entryList)
foundCryptos << path + QLatin1Char('/') + entry; foundCryptos << path + QLatin1Char('/') + entry;
} }