diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qconfig-small.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qfeatures.h | 15 | ||||
-rw-r--r-- | src/corelib/global/qfeatures.txt | 7 | ||||
-rw-r--r-- | src/corelib/io/qdebug.h | 2 |
5 files changed, 1 insertions, 29 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; } |