diff options
Diffstat (limited to 'src/corelib/tools/qtimezone.cpp')
-rw-r--r-- | src/corelib/tools/qtimezone.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index f5f2b28b88..cdd0aba102 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -47,6 +47,8 @@ #include <qdebug.h> +#include <algorithm> + QT_BEGIN_NAMESPACE // Create default time zone using appropriate backend @@ -781,7 +783,7 @@ QList<QByteArray> QTimeZone::availableTimeZoneIds() QSet<QByteArray> set = QUtcTimeZonePrivate().availableTimeZoneIds() + global_tz->backend->availableTimeZoneIds(); QList<QByteArray> list = set.toList(); - qSort(list); + std::sort(list.begin(), list.end()); return list; } @@ -801,7 +803,7 @@ QList<QByteArray> QTimeZone::availableTimeZoneIds(QLocale::Country country) QSet<QByteArray> set = QUtcTimeZonePrivate().availableTimeZoneIds(country) + global_tz->backend->availableTimeZoneIds(country); QList<QByteArray> list = set.toList(); - qSort(list); + std::sort(list.begin(), list.end()); return list; } @@ -817,7 +819,7 @@ QList<QByteArray> QTimeZone::availableTimeZoneIds(int offsetSeconds) QSet<QByteArray> set = QUtcTimeZonePrivate().availableTimeZoneIds(offsetSeconds) + global_tz->backend->availableTimeZoneIds(offsetSeconds); QList<QByteArray> list = set.toList(); - qSort(list); + std::sort(list.begin(), list.end()); return list; } |