summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2013-09-02 23:35:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-11 12:24:26 +0200
commitf070b141b6b9fae28abc1169a09a4b5e9c7adc74 (patch)
treecd47d670a61178cba9b4bf932bc7cd0fe14cb868 /src
parent0b9e39100b8a376b6660683ab9d8b1b994ee9d7a (diff)
Remove qSort usages from QtTestlib
QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I383d13f76eceae025daab5242f433f694c0149cd Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r--src/testlib/qtestcase.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 5d5a976201..9d9fcced76 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -65,6 +65,7 @@
#include <QtTest/private/cycle_p.h>
#include <numeric>
+#include <algorithm>
#include <stdarg.h>
#include <stdio.h>
@@ -1631,7 +1632,7 @@ QBenchmarkResult qMedian(const QList<QBenchmarkResult> &container)
return container.at(0);
QList<QBenchmarkResult> containerCopy = container;
- qSort(containerCopy);
+ std::sort(containerCopy.begin(), containerCopy.end());
const int middle = count / 2;