From 3256856bbea22da03109b84ef407e8dbc69930e7 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Mon, 2 Sep 2013 23:43:35 +0200
Subject: Remove qSort usages from QtConcurrent

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I07a8b13f75eb789c45a7c2ef11c0dc15d9fdf8f6
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/concurrent/qtconcurrentmedian.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h
index 7d3b50a45b..9079393388 100644
--- a/src/concurrent/qtconcurrentmedian.h
+++ b/src/concurrent/qtconcurrentmedian.h
@@ -47,7 +47,8 @@
 #ifndef QT_NO_CONCURRENT
 
 #include <QtCore/qvector.h>
-#include <QtCore/qalgorithms.h>
+
+#include <algorithm>
 
 QT_BEGIN_NAMESPACE
 
@@ -102,7 +103,7 @@ public:
         if (dirty) {
             dirty = false;
             QVector<T> sorted = values;
-            qSort(sorted);
+            std::sort(sorted.begin(), sorted.end());
             currentMedian = sorted.at(bufferSize / 2 + 1);
         }
         return currentMedian;
-- 
cgit v1.2.3