summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/doc/qttestlib.qdocconf2
-rw-r--r--src/testlib/qtestcase.cpp9
-rw-r--r--src/testlib/qtestlog.cpp1
3 files changed, 5 insertions, 7 deletions
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index ab2bdc1948..426236c339 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtTestLib
description = Qt Test Reference Documentation
-url = http://qt-project.org/doc/qt-$QT_VER/qttestlib
+url = http://qt-project.org/doc/qt-$QT_VER
version = $QT_VERSION
examplesinstallpath = testlib
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 4abbb34986..224357dd85 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1654,14 +1654,13 @@ QBenchmarkResult qMedian(const QList<QBenchmarkResult> &container)
if (count == 1)
return container.front();
- const int middle = count / 2;
-
QList<QBenchmarkResult> containerCopy = container;
- const QList<QBenchmarkResult>::iterator begin = containerCopy.begin(), mid = begin + middle, end = containerCopy.end();
- std::nth_element(begin, mid, end);
+ std::sort(containerCopy.begin(), containerCopy.end());
+
+ const int middle = count / 2;
// ### handle even-sized containers here by doing an aritmetic mean of the two middle items.
- return *mid;
+ return containerCopy.at(middle);
}
struct QTestDataSetter
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index d0cc3895c3..0e67335222 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -280,7 +280,6 @@ namespace QTest {
}
switch (type) {
- case QtTraceMsg:
case QtDebugMsg:
QTest::TestLoggers::addMessage(QAbstractTestLogger::QDebug, msg);
break;