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/itemviews | |
| 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/itemviews')
| -rw-r--r-- | tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index dfb780c8fa..4afe80b087 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); |