summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp6
-rw-r--r--tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp6
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index b29bf44307..9e0446388e 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -57,6 +57,8 @@
# include <qt_windows.h> // for SetFileAttributes
#endif
+#include <algorithm>
+
#define WAITTIME 1000
// Will try to wait for the condition while allowing event processing
@@ -717,8 +719,8 @@ void tst_QFileSystemModel::filters()
for (int i = 0; i < rowCount; ++i)
modelEntries.append(model->data(model->index(i, 0, root), QFileSystemModel::FileNameRole).toString());
- qSort(dirEntries);
- qSort(modelEntries);
+ std::sort(dirEntries.begin(), dirEntries.end());
+ std::sort(modelEntries.begin(), modelEntries.end());
QCOMPARE(dirEntries, modelEntries);
#ifdef Q_OS_LINUX
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 5739245899..38367fb4ee 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -46,6 +46,8 @@
#include <QtTest/QtTest>
#include "private/qapplication_p.h"
+#include <algorithm>
+
#ifdef QT_BUILD_INTERNAL
#define VERIFY_SPANS_CONSISTENCY(TEST_VIEW_) \
QVERIFY(static_cast<QTableViewPrivate*>(QObjectPrivate::get(TEST_VIEW_))->spans.checkConsistency())
@@ -3921,8 +3923,8 @@ void tst_QTableView::task234926_setHeaderSorting()
data << "orange" << "apple" << "banana" << "lemon" << "pumpkin";
QStringList sortedDataA = data;
QStringList sortedDataD = data;
- qSort(sortedDataA);
- qSort(sortedDataD.begin(), sortedDataD.end(), qGreater<QString>());
+ std::sort(sortedDataA.begin(), sortedDataA.end());
+ std::sort(sortedDataD.begin(), sortedDataD.end(), qGreater<QString>());
model.setStringList(data);
QTableView view;
view.setModel(&model);