diff options
| author | aavit <qt_aavit@ovi.com> | 2012-01-25 16:04:51 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 14:31:04 +0100 |
| commit | 4fce5d1795eaf6b9911e139b7ec50292d004e269 (patch) | |
| tree | 5c73da4cf0fb7f2059f50e54c1ece94762fab9d0 /src/gui/image/qimagewriter.cpp | |
| parent | bf9bdf5328172db65aafaee74d8fb9cbeaa9cc16 (diff) | |
Moving tiff image format support and libtiff out of qtbase
The tiff plugin and bundled libtiff is moving to the qtimageformats
project on Gerrit.
Task-number: QTBUG-23887
Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/image/qimagewriter.cpp')
| -rw-r--r-- | src/gui/image/qimagewriter.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index a909d8e722..966017452c 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -117,9 +117,6 @@ #ifndef QT_NO_IMAGEFORMAT_JPEG #include <private/qjpeghandler_p.h> #endif -#ifndef QT_NO_IMAGEFORMAT_TIFF -#include <private/qtiffhandler_p.h> -#endif #ifdef QT_BUILTIN_GIF_READER #include <private/qgifhandler_p.h> #endif @@ -183,10 +180,6 @@ static QImageIOHandler *createWriteHandlerHelper(QIODevice *device, } else if (testFormat == "jpg" || testFormat == "jpeg") { handler = new QJpegHandler; #endif -#ifndef QT_NO_IMAGEFORMAT_TIFF - } else if (testFormat == "tif" || testFormat == "tiff") { - handler = new QTiffHandler; -#endif #ifdef QT_BUILTIN_GIF_READER } else if (testFormat == "gif") { handler = new QGifHandler; @@ -666,13 +659,13 @@ bool QImageWriter::supportsOption(QImageIOHandler::ImageOption option) const \row \o JPEG \o Joint Photographic Experts Group \row \o PNG \o Portable Network Graphics \row \o PPM \o Portable Pixmap - \row \o TIFF \o Tagged Image File Format \row \o XBM \o X11 Bitmap \row \o XPM \o X11 Pixmap \endtable Reading and writing SVG files is supported through Qt's - \l{QtSvg Module}{SVG Module}. + \l{QtSvg Module}{SVG Module}. The \l{QtImageFormats Module}{Image Formats Module} + provides support for additional image formats. Note that the QApplication instance must be created before this function is called. @@ -698,9 +691,6 @@ QList<QByteArray> QImageWriter::supportedImageFormats() #ifndef QT_NO_IMAGEFORMAT_JPEG formats << "jpg" << "jpeg"; #endif -#ifndef QT_NO_IMAGEFORMAT_TIFF - formats << "tif" << "tiff"; -#endif #ifdef QT_BUILTIN_GIF_READER formats << "gif"; #endif |