diff options
Diffstat (limited to 'src/gui/image/qimagereader.cpp')
-rw-r--r-- | src/gui/image/qimagereader.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index ec55cb85a3..5c5b1fa0be 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -150,6 +150,8 @@ #include <private/qgifhandler_p.h> #endif +#include <algorithm> + QT_BEGIN_NAMESPACE #ifndef QT_NO_IMAGEFORMATPLUGIN @@ -199,7 +201,7 @@ static const _qt_BuiltInFormatStruct _qt_BuiltInFormats[] = { #endif #ifndef QT_NO_IMAGEFORMAT_JPEG {_qt_JpgFormat, "jpg", "image/jpeg"}, - {_qt_JpegFormat, "jpeg"}, + {_qt_JpegFormat, "jpeg", "image/jpeg"}, #endif #ifdef QT_BUILTIN_GIF_READER {_qt_GifFormat, "gif", "image/gif"}, @@ -1494,7 +1496,7 @@ QList<QByteArray> QImageReader::supportedImageFormats() for (QSet<QByteArray>::ConstIterator it = formats.constBegin(); it != formats.constEnd(); ++it) sortedFormats << *it; - qSort(sortedFormats); + std::sort(sortedFormats.begin(), sortedFormats.end()); return sortedFormats; } @@ -1521,7 +1523,7 @@ QList<QByteArray> QImageReader::supportedMimeTypes() for (QSet<QByteArray>::ConstIterator it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) sortedMimeTypes << *it; - qSort(sortedMimeTypes); + std::sort(sortedMimeTypes.begin(), sortedMimeTypes.end()); return sortedMimeTypes; } |