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.cpp | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/corelib/codecs/qgb18030codec.cpp')
| -rw-r--r-- | src/corelib/codecs/qgb18030codec.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp index 04e4bef4cd..4206eacb6f 100644 --- a/src/corelib/codecs/qgb18030codec.cpp +++ b/src/corelib/codecs/qgb18030codec.cpp @@ -45,8 +45,6 @@ #include "qgb18030codec_p.h" -#ifndef QT_NO_BIG_CODECS - QT_BEGIN_NAMESPACE #define InRange(c, lower, upper) (((c) >= (lower)) && ((c) <= (upper))) @@ -9116,5 +9114,3 @@ int qt_UnicodeToGbk(uint uni, uchar *gbchar) { } QT_END_NAMESPACE - -#endif // QT_NO_BIG_CODECS |