diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/corelib/codecs/qgb18030codec_p.h | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/corelib/codecs/qgb18030codec_p.h')
| -rw-r--r-- | src/corelib/codecs/qgb18030codec_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h index 635150b18e..c263309357 100644 --- a/src/corelib/codecs/qgb18030codec_p.h +++ b/src/corelib/codecs/qgb18030codec_p.h @@ -57,9 +57,9 @@ #include <QtCore/qtextcodec.h> #include <QtCore/qlist.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(big_codecs); -#ifndef QT_NO_BIG_CODECS +QT_BEGIN_NAMESPACE class QGb18030Codec : public QTextCodec { public: @@ -108,8 +108,6 @@ public: QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; -#endif // QT_NO_BIG_CODECS - QT_END_NAMESPACE #endif // QGB18030CODEC_P_H |