diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2013-04-13 00:01:09 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-15 13:17:26 +0200 |
| commit | 01f3ef20502c09ae0b001aa06212b646223a2ddd (patch) | |
| tree | de0a9e6626a97ce9318e6251b50c31cca947de97 /src | |
| parent | f1e74c07410c47aa02fa9726421c0485412e2cf4 (diff) | |
Make qtbase compile with QT_NO_IMAGEFORMATPLUGIN
qfeatures.h re-generated from qfeatures.txt because
QT_NO_IMAGEFORMATPLUGIN was missing
Change-Id: I1c9291529ec07f83f99c9cd08340cbfebda609b6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 7 | ||||
| -rw-r--r-- | src/gui/image/qimagereader.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qimagewriter.cpp | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index daf853b916..f2e5dc7633 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -238,7 +238,7 @@ // QWheelEvent //#define QT_NO_WHEELEVENT -// +// //#define QT_NO_XMLSTREAM // Animation @@ -301,6 +301,11 @@ #define QT_NO_IM #endif +// QImageIOPlugin +#if !defined(QT_NO_IMAGEFORMATPLUGIN) && (defined(QT_NO_LIBRARY)) +#define QT_NO_IMAGEFORMATPLUGIN +#endif + // QLocalServer #if !defined(QT_NO_LOCALSERVER) && (defined(QT_NO_TEMPORARYFILE)) #define QT_NO_LOCALSERVER diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index e612a2c374..5dd51843fb 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -1513,9 +1513,9 @@ QList<QByteArray> QImageReader::supportedMimeTypes() for (int i = 0; i < _qt_NumFormats; ++i) mimeTypes << _qt_BuiltInFormats[i].mimeType; -#ifndef QT_NO_LIBRARY +#ifndef QT_NO_IMAGEFORMATPLUGIN supportedImageHandlerMimeTypes(loader(), QImageIOPlugin::CanRead, &mimeTypes); -#endif // QT_NO_LIBRARY +#endif // QT_NO_IMAGEFORMATPLUGIN QList<QByteArray> sortedMimeTypes; for (QSet<QByteArray>::ConstIterator it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index 8823f9293d..a27dc9d16f 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -789,9 +789,9 @@ QList<QByteArray> QImageWriter::supportedMimeTypes() mimeTypes << "image/jpeg"; #endif -#ifndef QT_NO_LIBRARY +#ifndef QT_NO_IMAGEFORMATPLUGIN supportedImageHandlerMimeTypes(loader(), QImageIOPlugin::CanWrite, &mimeTypes); -#endif // QT_NO_LIBRARY +#endif // QT_NO_IMAGEFORMATPLUGIN QList<QByteArray> sortedMimeTypes; for (QSet<QByteArray>::ConstIterator it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) |