diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-02 12:59:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-07 13:19:54 +0000 |
| commit | 825f98815683faea06144ab0262129b0367798ee (patch) | |
| tree | 48b10de0d86c6312d07700eb4e690dbd87ab8db0 /src/corelib/serialization/qtextstream_p.h | |
| parent | b5d249f9538bf3dc44f11879c2244deb5a37bf97 (diff) | |
Modernize the "textcodec" feature
Also clean up QTextCodec usage in qmake build and some includes
of qtextcodec.h.
Change-Id: I0475b82690024054add4e85a8724c8ea3adcf62a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/serialization/qtextstream_p.h')
| -rw-r--r-- | src/corelib/serialization/qtextstream_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/serialization/qtextstream_p.h b/src/corelib/serialization/qtextstream_p.h index a642beddc4..172824d27d 100644 --- a/src/corelib/serialization/qtextstream_p.h +++ b/src/corelib/serialization/qtextstream_p.h @@ -54,7 +54,7 @@ #include <QtCore/private/qglobal_p.h> #include "qtextstream.h" -#ifndef QT_NO_TEXTCODEC +#if QT_CONFIG(textcodec) #include "qtextcodec.h" #endif @@ -118,7 +118,7 @@ public: int stringOffset; QIODevice::OpenMode stringOpenMode; -#ifndef QT_NO_TEXTCODEC +#if QT_CONFIG(textcodec) // codec QTextCodec *codec; QTextCodec::ConverterState readConverterState; @@ -141,7 +141,7 @@ public: int lastTokenSize; bool deleteDevice; -#ifndef QT_NO_TEXTCODEC +#if QT_CONFIG(textcodec) bool autoDetectUnicode; #endif |