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:55 +0200 |
commit | 32a69d67afbe146f8edbca4b018ebaf36d47b076 (patch) | |
tree | 3d06a4964f5e199389e3035f5e951c47e4921d1d /src/quick/items/qquickitem.cpp | |
parent | 13e7ffd5c22e0a7de16f9b8d5a192edbdcc95c04 (diff) |
Remove qStableSort usages from declarative
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I57912f2d1f36053055ea36b1699f704a675dc8b0
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index d27a964e4e..98a87a4bcf 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -76,6 +76,7 @@ # include <QtGui/qcursor.h> #endif +#include <algorithm> #include <float.h> // XXX todo Check that elements that create items handle memory correctly after visual ownership change @@ -2449,7 +2450,7 @@ QList<QQuickItem *> QQuickItemPrivate::paintOrderChildItems() const } if (haveZ) { sortedChildItems = new QList<QQuickItem*>(childItems); - qStableSort(sortedChildItems->begin(), sortedChildItems->end(), itemZOrder_sort); + std::stable_sort(sortedChildItems->begin(), sortedChildItems->end(), itemZOrder_sort); return *sortedChildItems; } |