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/codecs/qtextcodec.h | |
| parent | b5d249f9538bf3dc44f11879c2244deb5a37bf97 (diff) | |
| download | qtbase-825f98815683faea06144ab0262129b0367798ee.tar.gz | |
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/codecs/qtextcodec.h')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index 8153bebac8..c0261b7aa2 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -43,10 +43,9 @@ #include <QtCore/qstring.h> #include <QtCore/qlist.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(textcodec); -#ifndef QT_NO_TEXTCODEC +QT_BEGIN_NAMESPACE class QTextCodec; class QIODevice; @@ -167,8 +166,6 @@ private: QTextCodec::ConverterState state; }; -#endif // QT_NO_TEXTCODEC - QT_END_NAMESPACE #endif // QTEXTCODEC_H |