summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qfeatures.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global/qfeatures.h')
-rw-r--r--src/corelib/global/qfeatures.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 027068b61c..5055414834 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -289,9 +289,6 @@
// HtmlParser
//#define QT_NO_TEXTHTMLPARSER
-// QTextStream
-//#define QT_NO_TEXTSTREAM
-
// QToolTip
//#define QT_NO_TOOLTIP
@@ -351,16 +348,6 @@
#define QT_NO_FILESYSTEMMODEL
#endif
-// QHostInfo
-#if !defined(QT_NO_HOSTINFO) && (defined(QT_NO_TEXTSTREAM))
-#define QT_NO_HOSTINFO
-#endif
-
-// XPM Image Format
-#if !defined(QT_NO_IMAGEFORMAT_XPM) && (defined(QT_NO_TEXTSTREAM))
-#define QT_NO_IMAGEFORMAT_XPM
-#endif
-
// QLibrary
#if !defined(QT_NO_LIBRARY) && (defined(QT_NO_SETTINGS))
#define QT_NO_LIBRARY
@@ -597,7 +584,7 @@
#endif
// QPrinter
-#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE))
+#if !defined(QT_NO_PRINTER) && (defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE))
#define QT_NO_PRINTER
#endif