10 files changed, 2 insertions, 36 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 05a595ed55..30440243de 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -104,9 +104,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
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index fefbfb6f02..84a5ec59d9 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -77,9 +77,6 @@
 #endif
 
 /* File I/O */
-#ifndef QT_NO_TEXTSTREAM
-#  define QT_NO_TEXTSTREAM
-#endif
 #ifndef QT_NO_SETTINGS
 #  define QT_NO_SETTINGS
 #endif
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
 
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 6b861d4d17..4eae2f50ec 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -192,13 +192,6 @@ Requires:
 Name: QProcess
 SeeAlso: ???
 
-Feature: TEXTSTREAM
-Description: Supports reading and writing of text.
-Section: File I/O
-Requires:
-Name: QTextStream
-SeeAlso: ???
-
 Feature: TEMPORARYFILE
 Description: Provides an I/O device that operates on temporary files.
 Section: File I/O
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 0654bf6f25..54663d5d65 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -129,10 +129,8 @@ public:
     inline QNoDebug(){}
     inline QNoDebug(const QDebug &){}
     inline ~QNoDebug(){}
-#if !defined( QT_NO_TEXTSTREAM )
     inline QNoDebug &operator<<(QTextStreamFunction) { return *this; }
     inline QNoDebug &operator<<(QTextStreamManipulator) { return *this; }
-#endif
     inline QNoDebug &space() { return *this; }
     inline QNoDebug &nospace() { return *this; }
     inline QNoDebug &maybeSpace() { return *this; }
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 94cf99c6ed..5a4702d992 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -1177,7 +1177,7 @@ QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
           << ',' << certificate.issuerInfo(QSslCertificate::Organization)
           << ',' << certificate.subjectInfo(QSslCertificate::Organization)
           << ',' << certificate.subjectAlternativeNames()
-#ifndef QT_NO_TEXTSTREAM
+#ifndef QT_NO_DATESTRING
           << ',' << certificate.effectiveDate()
           << ',' << certificate.expiryDate()
 #endif
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index 50c1af1775..83fcee18d6 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -19,7 +19,6 @@ DEFINES	       += \
         QT_NO_QOBJECT \
         QT_NO_STL \
         QT_NO_SYSTEMLOCALE \
-        QT_NO_TEXTSTREAM \
         QT_NO_THREAD \
         QT_NO_UNICODETABLES \
         QT_NO_USING_NAMESPACE \
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index fdebd9be24..b5869d826c 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -22,7 +22,6 @@ DEFINES += \
         QT_NO_QOBJECT \
         QT_NO_STL \
         QT_NO_SYSTEMLOCALE \
-        QT_NO_TEXTSTREAM \
         QT_NO_THREAD \
         QT_NO_UNICODETABLES \
         QT_NO_USING_NAMESPACE \
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 415ff6e97f..ca22e0718a 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -1675,7 +1675,6 @@ void QSplitter::setStretchFactor(int index, int stretch)
 }
 
 
-#ifndef QT_NO_TEXTSTREAM
 /*!
     \relates QSplitter
     \obsolete
@@ -1706,7 +1705,6 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter)
     splitter.restoreState(line.toAscii());
     return ts;
 }
-#endif // QT_NO_TEXTSTREAM
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h
index c93af70401..ee62ab76f2 100644
--- a/src/widgets/widgets/qsplitter.h
+++ b/src/widgets/widgets/qsplitter.h
@@ -133,10 +133,8 @@ private:
     friend class QSplitterHandle;
 };
 
-#ifndef QT_NO_TEXTSTREAM
 Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&);
 Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&);
-#endif
 
 class QSplitterHandlePrivate;
 class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget