summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sorvig <morten.sorvig@nokia.com>2010-02-04 17:55:16 +0100
committerMorten Sorvig <morten.sorvig@nokia.com>2010-02-04 17:55:16 +0100
commit4734d63bd4549f9d51a8484f5ea6aec5e1953861 (patch)
tree07b31bc927cca5fc8476ece70ce4094714e58190
parentead3fba59d0c89130ddaca8e3ef49e26e11ee79c (diff)
Compile in image format support and QTextStream.
This unbreaks a lot of the examples that were trying to load image resources, and also enables support for the plastique style.
-rw-r--r--src/corelib/global/qconfig-minimal-system-dependencies.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/corelib/global/qconfig-minimal-system-dependencies.h b/src/corelib/global/qconfig-minimal-system-dependencies.h
index aa2730e933..7b85af8ed1 100644
--- a/src/corelib/global/qconfig-minimal-system-dependencies.h
+++ b/src/corelib/global/qconfig-minimal-system-dependencies.h
@@ -89,9 +89,6 @@
#ifndef QT_NO_TEMPORARYFILE
# define QT_NO_TEMPORARYFILE
#endif
-#ifndef QT_NO_TEXTSTREAM
-# define QT_NO_TEXTSTREAM
-#endif
#ifndef QT_NO_SETTINGS
# define QT_NO_SETTINGS
#endif
@@ -108,24 +105,6 @@
#ifndef QT_NO_IMAGEFORMATPLUGIN
# define QT_NO_IMAGEFORMATPLUGIN
#endif
-#ifndef QT_NO_IMAGEFORMAT_BMP
-# define QT_NO_IMAGEFORMAT_BMP
-#endif
-#ifndef QT_NO_IMAGEFORMAT_JPEG
-# define QT_NO_IMAGEFORMAT_JPEG
-#endif
-#ifndef QT_NO_IMAGEFORMAT_PNG
-# define QT_NO_IMAGEFORMAT_PNG
-#endif
-#ifndef QT_NO_IMAGEFORMAT_PPM
-# define QT_NO_IMAGEFORMAT_PPM
-#endif
-#ifndef QT_NO_IMAGEFORMAT_XBM
-# define QT_NO_IMAGEFORMAT_XBM
-#endif
-#ifndef QT_NO_IMAGEFORMAT_XPM
-# define QT_NO_IMAGEFORMAT_XPM
-#endif
#ifndef QT_NO_IMAGE_HEURISTIC_MASK
# define QT_NO_IMAGE_HEURISTIC_MASK
#endif