diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-18 09:33:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 08:10:06 +0100 |
| commit | a01b7dad50a526189f8f3abe6f48290458225f02 (patch) | |
| tree | 5548cf044175aae69729a5d32888d2ca6466ca7b /tests/auto/printsupport/kernel | |
| parent | ac127a8c09ab91d15adb1cb9d44123f3e0185e00 (diff) | |
Remove qSort usages from tests
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I4c48db80533802e37771d3967fa10bfb7000cb9a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/printsupport/kernel')
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp index 9416224440..fb2609b7ec 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp @@ -44,6 +44,8 @@ #include <QtAlgorithms> #include <QtPrintSupport/qprinterinfo.h> +#include <algorithm> + #ifdef Q_OS_UNIX # include <unistd.h> # include <sys/types.h> @@ -246,8 +248,8 @@ void tst_QPrinterInfo::testForPrinters() for (int i = 0; i < printers.size(); ++i) qtPrinters.append(printers.at(i).printerName()); - qSort(testPrinters); - qSort(qtPrinters); + std::sort(testPrinters.begin(), testPrinters.end()); + std::sort(qtPrinters.begin(), qtPrinters.end()); qDebug() << "Test believes Available Printers = " << testPrinters; qDebug() << "QPrinterInfo::availablePrinters() believes Available Printers = " << qtPrinters; |