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/qeucjpcodec.cpp | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/corelib/codecs/qeucjpcodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qeucjpcodec.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp index c3131fe601..3192f355d8 100644 --- a/src/corelib/codecs/qeucjpcodec.cpp +++ b/src/corelib/codecs/qeucjpcodec.cpp @@ -76,8 +76,6 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_BIG_CODECS - static const uchar Ss2 = 0x8e; // Single Shift 2 static const uchar Ss3 = 0x8f; // Single Shift 3 @@ -255,6 +253,5 @@ QByteArray QEucJpCodec::_name() { return "EUC-JP"; } -#endif // QT_NO_BIG_CODECS QT_END_NAMESPACE |