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/quick/util | |
| 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/quick/util')
| -rw-r--r-- | src/quick/util/qquicktimeline.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp index f1d7e19dc2..4667a5856c 100644 --- a/src/quick/util/qquicktimeline.cpp +++ b/src/quick/util/qquicktimeline.cpp @@ -51,6 +51,8 @@ #include <QTime> #include <QtNumeric> +#include <algorithm> + QT_BEGIN_NAMESPACE struct Update { @@ -808,7 +810,7 @@ int QQuickTimeLinePrivate::advance(int t) length -= qMin(length, advanceTime); syncPoint -= advanceTime; - qSort(updates.begin(), updates.end()); + std::sort(updates.begin(), updates.end()); updateQueue = &updates; for (int ii = 0; ii < updates.count(); ++ii) { const Update &v = updates.at(ii).second; |