diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-12 11:06:59 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 01:10:37 +0200 |
commit | 4df73e62a70b73d955ab53faef4615ea03a21a4d (patch) | |
tree | 00acf9163a0447da03298659bc47d2de9da509f7 /src/qml/jsruntime/qv4sequenceobject.cpp | |
parent | c1821de0e6ef21f86623572fd54f5cc5451b6077 (diff) |
Remove qSort usages from declarative
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4sequenceobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index d07277aa5d..058964969c 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -48,6 +48,8 @@ #include <private/qqmlengine_p.h> #include <private/qv4scopedvalue_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE using namespace QV4; @@ -376,10 +378,10 @@ public: if (ctx->argumentCount == 1 && ctx->arguments[0].asFunctionObject()) { QV4::Value compareFn = ctx->arguments[0]; CompareFunctor cf(ctx, compareFn); - qSort(m_container.begin(), m_container.end(), cf); + std::sort(m_container.begin(), m_container.end(), cf); } else { DefaultCompareFunctor cf; - qSort(m_container.begin(), m_container.end(), cf); + std::sort(m_container.begin(), m_container.end(), cf); } if (m_isReference) |