summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qregexp.cpp
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2011-10-06 14:56:24 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-06 19:24:26 +0200
commit2bf2bb3daf32935e3642447d40732998df819556 (patch)
treed12419f56ded95b6eec385a79597bdb0b0898a9b /src/corelib/tools/qregexp.cpp
parentdf08cb70906abce38cd54fb38f5b349424bd31a9 (diff)
fix QChar::isSpace() to handle codepoint U+0085
according to the Unicode specs, code point U+0085 should be treated like a white space character (an exceptional Cc one) Change-Id: Ib17ae0c4d3cdafe667cafa38b645138ef24c238c Merge-request: 32 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-on: http://codereview.qt-project.org/6158 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
-rw-r--r--src/corelib/tools/qregexp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 5e2e56ea34..59a54f3eb7 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -2950,7 +2950,8 @@ int QRegExpEngine::getEscape()
FLAG(QChar::Other_Control)));
yyCharClass->addRange(0x0000, 0x0008);
yyCharClass->addRange(0x000e, 0x001f);
- yyCharClass->addRange(0x007f, 0x009f);
+ yyCharClass->addRange(0x007f, 0x0084);
+ yyCharClass->addRange(0x0086, 0x009f);
return Tok_CharClass;
case 'W':
// see QChar::isLetterOrNumber() and QChar::isMark()
@@ -2991,6 +2992,7 @@ int QRegExpEngine::getEscape()
FLAG(QChar::Separator_Line) |
FLAG(QChar::Separator_Paragraph));
yyCharClass->addRange(0x0009, 0x000d);
+ yyCharClass->addSingleton(0x0085);
return Tok_CharClass;
case 'w':
// see QChar::isLetterOrNumber() and QChar::isMark()