diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 14:22:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 14:22:24 (GMT) |
| commit | f50a2555301e7e1d5e4bde32c380a3576e998407 (patch) | |
| tree | 53dbef90951408f27c2757ce710dde800fe51c63 /src/plugins | |
| parent | 2c07b5d2cba8d8e499bd0861eefef12d4e00d99a (diff) | |
| parent | 8e321cd869da7ff1cf0168da41aa0246b44867cc (diff) | |
| download | Qt-f50a2555301e7e1d5e4bde32c380a3576e998407.zip Qt-f50a2555301e7e1d5e4bde32c380a3576e998407.tar.gz Qt-f50a2555301e7e1d5e4bde32c380a3576e998407.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
Fix crashes with regular expressions QtScript on ARM traditional architectures
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/codecs/jp/qsjiscodec.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp index 49190d3..3ea5300 100644 --- a/src/plugins/codecs/jp/qsjiscodec.cpp +++ b/src/plugins/codecs/jp/qsjiscodec.cpp @@ -155,7 +155,9 @@ QString QSjisCodec::convertToUnicode(const char* chars, int len, ConverterState uchar ch = chars[i]; switch (nbuf) { case 0: - if (ch < 0x80 || IsKana(ch)) { + if (ch < 0x80) { + result += QValidChar(ch); + } else if (IsKana(ch)) { // JIS X 0201 Latin or JIS X 0201 Kana u = conv->jisx0201ToUnicode(ch); result += QValidChar(u); |