diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-26 15:14:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 15:47:37 +0200 |
| commit | 800e4bc80f0d8d1ec1b7ba058a1eb2a61616937b (patch) | |
| tree | 165a9e8af6eddab0f983a98292bd8f2a1b9b4d69 /src/declarative/util/qdeclarativetimeline.cpp | |
| parent | 31b107298609928c0eaa2e974ade59ce9d815e2c (diff) | |
Remove QtAlgorithms usage from QtQuick1.
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I774f69bd3e60764a144b921a2383d832b38765ce
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/declarative/util/qdeclarativetimeline.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativetimeline.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp index 2e7ba8c4..d4045ef3 100644 --- a/src/declarative/util/qdeclarativetimeline.cpp +++ b/src/declarative/util/qdeclarativetimeline.cpp @@ -50,6 +50,8 @@ #include <QEasingCurve> #include <QTime> +#include <algorithm> + QT_BEGIN_NAMESPACE struct Update { @@ -807,7 +809,7 @@ int QDeclarativeTimeLinePrivate::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; |