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/compiler/qv4ssa.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/compiler/qv4ssa.cpp')
| -rw-r--r-- | src/qml/compiler/qv4ssa.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp index 098f6eef10..541793f6ae 100644 --- a/src/qml/compiler/qv4ssa.cpp +++ b/src/qml/compiler/qv4ssa.cpp @@ -54,6 +54,7 @@ #include <cmath> #include <iostream> #include <cassert> +#include <algorithm> #ifdef CONST #undef CONST @@ -2576,7 +2577,7 @@ public: range.setTemp(i.key()); _sortedRanges.append(range); } - qSort(_sortedRanges.begin(), _sortedRanges.end(), LifeTimeInterval::lessThan); + std::sort(_sortedRanges.begin(), _sortedRanges.end(), LifeTimeInterval::lessThan); } QList<LifeTimeInterval> ranges() const { return _sortedRanges; } @@ -2593,7 +2594,7 @@ public: foreach (BasicBlock *bb, _liveIn.keys()) { qout << "L" << bb->index <<" live-in: "; QList<Temp> live = QList<Temp>::fromSet(_liveIn.value(bb)); - qSort(live); + std::sort(live.begin(), live.end()); for (int i = 0; i < live.size(); ++i) { if (i > 0) qout << ", "; live[i].dump(qout); |