diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:04:10 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 23:20:09 +0200 |
commit | aa3f358d433ec7fbe0237141c22297f3d8d4120d (patch) | |
tree | 924e0f4387f601cf1183d0dbfa5433f641dc7a96 /src/gui/painting/qpaintengine_raster.cpp | |
parent | 50a8a5e7959ca315e812413661a76576b7c3bbb8 (diff) |
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 <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 7112380043..3586b3452a 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -72,6 +72,7 @@ #include "qoutlinemapper_p.h" #include <limits.h> +#include <algorithm> #ifdef Q_OS_WIN # include <qvarlengtharray.h> @@ -1853,7 +1854,7 @@ static bool splitPolygon(const QPointF *points, int pointCount, QVector<QPointF> for (int i = 0; i < pointCount; ++i) sorted << points + i; - qSort(sorted.begin(), sorted.end(), isAbove); + std::sort(sorted.begin(), sorted.end(), isAbove); qreal splitY = sorted.at(sorted.size() / 2)->y(); |