diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-17 23:37:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 08:10:19 +0100 |
| commit | 170df5addb5334befc8c61130c748fb77de46600 (patch) | |
| tree | d17e9144f6e914b8a427fd2d7bff189dccebe3f0 /tests/auto/gui/image/qicon | |
| parent | a01b7dad50a526189f8f3abe6f48290458225f02 (diff) | |
Remove qSort usages from gui tests
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: Idf0fc471f8ab7b30a097d8faf93c93d5ebbb03ef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/gui/image/qicon')
| -rw-r--r-- | tests/auto/gui/image/qicon/tst_qicon.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index bfe2fbc9f7..0f642bcc10 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -45,6 +45,8 @@ #include <qicon.h> #include <qiconengine.h> +#include <algorithm> + class tst_QIcon : public QObject { @@ -421,7 +423,7 @@ void tst_QIcon::availableSizes() QList<QSize> availableSizes = icon.availableSizes(); QCOMPARE(availableSizes.size(), 3); - qSort(availableSizes.begin(), availableSizes.end(), sizeLess); + std::sort(availableSizes.begin(), availableSizes.end(), sizeLess); QCOMPARE(availableSizes.at(0), QSize(32,32)); QCOMPARE(availableSizes.at(1), QSize(64,64)); QCOMPARE(availableSizes.at(2), QSize(128,128)); |