1 files changed, 8 insertions, 59 deletions

diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 4dada4ca82..45d57856aa 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -147,6 +147,9 @@
 #include <private/qfactoryloader_p.h>
 #include <QMutexLocker>
 
+// for qt_getImageText
+#include <private/qimage_p.h>
+
 // image handlers
 #include <private/qbmphandler_p.h>
 #include <private/qppmhandler_p.h>
@@ -155,12 +158,6 @@
 #ifndef QT_NO_IMAGEFORMAT_PNG
 #include <private/qpnghandler_p.h>
 #endif
-#ifndef QT_NO_IMAGEFORMAT_JPEG
-#include <private/qjpeghandler_p.h>
-#endif
-#ifdef QT_BUILTIN_GIF_READER
-#include <private/qgifhandler_p.h>
-#endif
 
 #include <algorithm>
 
@@ -175,13 +172,6 @@ enum _qt_BuiltInFormatType {
 #ifndef QT_NO_IMAGEFORMAT_PNG
     _qt_PngFormat,
 #endif
-#ifndef QT_NO_IMAGEFORMAT_JPEG
-    _qt_JpgFormat,
-    _qt_JpegFormat,
-#endif
-#ifdef QT_BUILTIN_GIF_READER
-    _qt_GifFormat,
-#endif
 #ifndef QT_NO_IMAGEFORMAT_BMP
     _qt_BmpFormat,
 #endif
@@ -210,13 +200,6 @@ static const _qt_BuiltInFormatStruct _qt_BuiltInFormats[] = {
 #ifndef QT_NO_IMAGEFORMAT_PNG
     {"png", "image/png"},
 #endif
-#ifndef QT_NO_IMAGEFORMAT_JPEG
-    {"jpg", "image/jpeg"},
-    {"jpeg", "image/jpeg"},
-#endif
-#ifdef QT_BUILTIN_GIF_READER
-    {"gif", "image/gif"},
-#endif
 #ifndef QT_NO_IMAGEFORMAT_BMP
     {"bmp", "image/bmp"},
 #endif
@@ -357,14 +340,6 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
         } else if (testFormat == "png") {
             handler = new QPngHandler;
 #endif
-#ifndef QT_NO_IMAGEFORMAT_JPEG
-        } else if (testFormat == "jpg" || testFormat == "jpeg") {
-            handler = new QJpegHandler;
-#endif
-#ifdef QT_BUILTIN_GIF_READER
-        } else if (testFormat == "gif") {
-            handler = new QGifHandler;
-#endif
 #ifndef QT_NO_IMAGEFORMAT_BMP
         } else if (testFormat == "bmp") {
             handler = new QBmpHandler;
@@ -442,19 +417,6 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
                     handler = new QPngHandler;
                 break;
 #endif
-#ifndef QT_NO_IMAGEFORMAT_JPEG
-            case _qt_JpgFormat:
-            case _qt_JpegFormat:
-                if (QJpegHandler::canRead(device))
-                    handler = new QJpegHandler;
-                break;
-#endif
-#ifdef QT_BUILTIN_GIF_READER
-            case _qt_GifFormat:
-                if (QGifHandler::canRead(device))
-                    handler = new QGifHandler;
-                break;
-#endif
 #ifndef QT_NO_IMAGEFORMAT_BMP
             case _qt_BmpFormat:
                 if (QBmpHandler::canRead(device))
@@ -491,8 +453,8 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
 
             if (handler) {
 #ifdef QIMAGEREADER_DEBUG
-                qDebug() << "QImageReader::createReadHandler: the" << _qt_BuiltInFormats[currentFormat].extension
-                         << "built-in handler can read this data";
+                qDebug("QImageReader::createReadHandler: the %s built-in handler can read this data",
+                       _qt_BuiltInFormats[currentFormat].extension);
 #endif
                 break;
             }
@@ -633,18 +595,8 @@ bool QImageReaderPrivate::initHandler()
 */
 void QImageReaderPrivate::getText()
 {
-    if (!text.isEmpty() || (!handler && !initHandler()) || !handler->supportsOption(QImageIOHandler::Description))
-        return;
-    foreach (const QString &pair, handler->option(QImageIOHandler::Description).toString().split(
-                QLatin1String("\n\n"))) {
-        int index = pair.indexOf(QLatin1Char(':'));
-        if (index >= 0 && pair.indexOf(QLatin1Char(' ')) < index) {
-            text.insert(QLatin1String("Description"), pair.simplified());
-        } else {
-            QString key = pair.left(index);
-            text.insert(key, pair.mid(index + 2).simplified());
-        }
-    }
+    if (text.isEmpty() && (handler || initHandler()) && handler->supportsOption(QImageIOHandler::Description))
+        text = qt_getImageTextFromDescription(handler->option(QImageIOHandler::Description).toString());
 }
 
 /*!
@@ -674,12 +626,9 @@ QImageReader::QImageReader(QIODevice *device, const QByteArray &format)
     \sa setFileName()
 */
 QImageReader::QImageReader(const QString &fileName, const QByteArray &format)
-    : d(new QImageReaderPrivate(this))
+    : QImageReader(new QFile(fileName), format)
 {
-    QFile *file = new QFile(fileName);
-    d->device = file;
     d->deleteDevice = true;
-    d->format = format;
 }
 
 /*!