diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:12 +0100 |
| commit | c69f43594fc921fea82377e7b31a7f55f718051d (patch) | |
| tree | 37d30b254f0c24f9588dcb3e8f1b47becdba8ef1 /src/corelib/codecs/qtextcodec.h | |
| parent | 9137691e745039f8ad9cdee2594a958e244ba341 (diff) | |
| parent | dec7961709c90f6977d2447f7fa6c6625af41cb2 (diff) | |
Merge 5.11 into 5.11.3
Change-Id: I9a84ca8038a65daab50b6205bc7e1e3b5b5098aa
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 |