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/qsjiscodec.cpp | |
| 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/qsjiscodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qsjiscodec.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp index ba342c9c53..4f5f9069cd 100644 --- a/src/corelib/codecs/qsjiscodec.cpp +++ b/src/corelib/codecs/qsjiscodec.cpp @@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_BIG_CODECS enum { Esc = 0x1b }; @@ -223,6 +222,5 @@ QList<QByteArray> QSjisCodec::_aliases() << "MS_Kanji"; return list; } -#endif // QT_NO_BIG_CODECS QT_END_NAMESPACE |