summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorTasuku Suzuki <stasuku@gmail.com>2013-04-13 00:01:09 +0900
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-15 13:17:26 +0200
commit01f3ef20502c09ae0b001aa06212b646223a2ddd (patch)
treede0a9e6626a97ce9318e6251b50c31cca947de97 /src/corelib
parentf1e74c07410c47aa02fa9726421c0485412e2cf4 (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/corelib')
-rw-r--r--src/corelib/global/qfeatures.h7
1 files changed, 6 insertions, 1 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