diff options
author | Liang Qi <liang.qi@qt.io> | 2018-10-26 10:28:24 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-26 10:28:24 +0000 |
commit | 00b2e45a97205975ee91aa43f00e3dbef1a8907b (patch) | |
tree | ed44e50bc893e87434d72470c2c809b1fb34de72 /src/corelib/codecs/qgb18030codec_p.h | |
parent | 9cd527bc1f384926985d63c741641316a66f17a4 (diff) | |
parent | e28e91ae99b8c3859899e04cc9370534c7c7b86d (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev
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 |