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/image/qpicture.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/image/qpicture.cpp')
| -rw-r--r-- | src/gui/image/qpicture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 1071ed754b..e7fbb2a6a9 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -59,6 +59,8 @@ #include "qregion.h" #include "qdebug.h" +#include <algorithm> + QT_BEGIN_NAMESPACE void qt_format_text(const QFont &fnt, const QRectF &_r, @@ -1798,7 +1800,7 @@ QList<QByteArray> QPictureIO::inputFormats() result.append(p->format); } } - qSort(result); + std::sort(result.begin(), result.end()); return result; } |