diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:52:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 17:47:15 +0200 |
| commit | a78699e7f346bae5147017a872cb042cb834aa50 (patch) | |
| tree | a621a87fa8d9444a48110b9e36dda4310f5894d9 /src/widgets/styles/qstyle.cpp | |
| parent | c6d3fa1dcfbacdbcfb23b76ca6c5cede0ea9a5ef (diff) | |
Remove qSort from QtWidgets
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: Iec5c10fc4c3b4e684b51f6223bf3cb56acc42b58
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Diffstat (limited to 'src/widgets/styles/qstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qstyle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 99bbf2f363..77f869f036 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -53,6 +53,7 @@ #endif #include <limits.h> +#include <algorithm> QT_BEGIN_NAMESPACE @@ -2337,7 +2338,7 @@ QDebug operator<<(QDebug debug, QStyle::State state) if (state & QStyle::State_Top) states << QLatin1String("Top"); if (state & QStyle::State_UpArrow) states << QLatin1String("UpArrow"); - qSort(states); + std::sort(states.begin(), states.end()); debug << states.join(QLatin1String(" | ")); debug << ')'; #else |