From aa3f358d433ec7fbe0237141c22297f3d8d4120d Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 3 Sep 2013 00:04:10 +0200 Subject: Remove deprecated QtAlgorithms calls from QtGui QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I324ddf6129fe8884ecea97ef47abb7c071dfb34c Reviewed-by: Gunnar Sletta --- src/gui/painting/qrasterizer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui/painting/qrasterizer.cpp') diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp index 197d49369e..a7e7d89ec4 100644 --- a/src/gui/painting/qrasterizer.cpp +++ b/src/gui/painting/qrasterizer.cpp @@ -48,6 +48,8 @@ #include #include +#include + QT_BEGIN_NAMESPACE typedef int Q16Dot16; @@ -326,7 +328,7 @@ void qScanConvert(QScanConverter &d, T allVertical) d.m_active.reset(); return; } - qSort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), QT_PREPEND_NAMESPACE(topOrder)); + std::sort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), QT_PREPEND_NAMESPACE(topOrder)); int line = 0; for (int y = d.m_lines.first().top; y <= d.m_bottom; ++y) { for (; line < d.m_lines.size() && d.m_lines.at(line).top == y; ++line) { -- cgit v1.2.3