diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-18 09:22:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-18 11:59:55 +0100 |
| commit | 8102b75ee85a4cf0c2af2eea3787ff0209e01998 (patch) | |
| tree | 15b92ffd7305a8b8cf423be70486ada2712eec72 /tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp | |
| parent | 21fbca97a8ee284ff6ffaff64c180700cc5537ab (diff) | |
Remove qSort usages from widgets tests
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: Ica7639d16f52b4ffcd2c00cc806fed1378a7948b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp')
| -rw-r--r-- | tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 9cb391d5f4..eac3f9c9ae 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 @@ -710,8 +712,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 |