diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-27 14:13:26 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 10:18:15 +0200 |
commit | e200f05bc75d8f19df624bc3849d9c5bbf096873 (patch) | |
tree | f35be5b7c249ce3274c74430707c0e7f3e429d32 /src/positioning/qgeopositioninfosource.cpp | |
parent | 32cb5bcec7a63c9c9f858cca950693b789ddba8c (diff) | |
download | qtlocation-e200f05bc75d8f19df624bc3849d9c5bbf096873.tar.gz |
QtAlgorithms have been deprecated (1 of 2)
Convert to std algorithms to avoid warnings. One qSort case is still
left since it seems to require a more elaborate fix.
Task-number: QTBUG-11022
Change-Id: Ieccc5050b127a58ff1f0aa7c488909f2acfa2972
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/positioning/qgeopositioninfosource.cpp')
-rw-r--r-- | src/positioning/qgeopositioninfosource.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index 4fa7a4ca..b1617560 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -50,6 +50,8 @@ #include <QtCore/private/qfactoryloader_p.h> #include <QtCore/private/qlibrary_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE #ifndef QT_NO_LIBRARY @@ -153,7 +155,7 @@ static bool pluginComparator(const QJsonObject &p1, const QJsonObject &p2) QList<QJsonObject> QGeoPositionInfoSourcePrivate::pluginsSorted() { QList<QJsonObject> list = plugins().values(); - qStableSort(list.begin(), list.end(), pluginComparator); + std::stable_sort(list.begin(), list.end(), pluginComparator); return list; } |