diff -r 5dc02b23752f -r 3e2da88830cd src/gui/image/qimagewriter.cpp --- a/src/gui/image/qimagewriter.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/src/gui/image/qimagewriter.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -114,6 +114,18 @@ #ifndef QT_NO_IMAGEFORMAT_PNG #include #endif +#ifndef QT_NO_IMAGEFORMAT_JPEG +#include +#endif +#ifndef QT_NO_IMAGEFORMAT_MNG +#include +#endif +#ifndef QT_NO_IMAGEFORMAT_TIFF +#include +#endif +#ifdef QT_BUILTIN_GIF_READER +#include +#endif QT_BEGIN_NAMESPACE @@ -170,6 +182,22 @@ } else if (testFormat == "png") { handler = new QPngHandler; #endif +#ifndef QT_NO_IMAGEFORMAT_JPEG + } else if (testFormat == "jpg" || testFormat == "jpeg") { + handler = new QJpegHandler; +#endif +#ifndef QT_NO_IMAGEFORMAT_MNG + } else if (testFormat == "mng") { + handler = new QMngHandler; +#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; +#endif #ifndef QT_NO_IMAGEFORMAT_BMP } else if (testFormat == "bmp") { handler = new QBmpHandler; @@ -669,6 +697,18 @@ #ifndef QT_NO_IMAGEFORMAT_PNG formats << "png"; #endif +#ifndef QT_NO_IMAGEFORMAT_JPEG + formats << "jpg" << "jpeg"; +#endif +#ifndef QT_NO_IMAGEFORMAT_MNG + formats << "mng"; +#endif +#ifndef QT_NO_IMAGEFORMAT_TIFF + formats << "tif" << "tiff"; +#endif +#ifdef QT_BUILTIN_GIF_READER + formats << "gif"; +#endif #ifndef QT_NO_LIBRARY QFactoryLoader *l = loader();