path: root/src/corelib/tools/qunicodetools.cpp
diff options
authorLiang Qi <>2017-01-31 08:49:01 +0100
committerLiang Qi <>2017-02-01 08:35:42 +0000
commit3cd1c3cb70dd57df939ad067f5668e8304d32237 (patch)
tree759f9c14dc4fbfb50bd84a8d8e6815e274e0ed87 /src/corelib/tools/qunicodetools.cpp
parent681c15891e723925a876f5d3e8d711b503384285 (diff)
Fix libs build with msvc on Chinese locale on Windows
Chinese locale means Code Page 936 here. It's also related with removing C4819 warnings. And it's also following Conventions in Qt source code: All code is ascii only (7-bit characters only, run man ascii if unsure) See also Task-number: QTBUG-56155 Task-number: QTBUG-58161 Change-Id: I37fa7a0e6a82a16eaf80e1cc99be801099ab87de Reviewed-by: Friedemann Kleint <> Reviewed-by: jian liang <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/corelib/tools/qunicodetools.cpp')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/tools/qunicodetools.cpp
index be1d88e260..ac19d6b6d1 100644
--- a/src/corelib/tools/qunicodetools.cpp
+++ b/src/corelib/tools/qunicodetools.cpp
@@ -714,7 +714,7 @@ Q_CORE_EXPORT void initScripts(const ushort *string, int length, uchar *scripts)
// Never break between a combining mark (gc= Mc, Mn or Me) and its base character.
- // Thus, a combining mark — whatever its script property value is — should inherit
+ // Thus, a combining mark - whatever its script property value is - should inherit
// the script property value of its base character.
static const int test = (FLAG(QChar::Mark_NonSpacing) | FLAG(QChar::Mark_SpacingCombining) | FLAG(QChar::Mark_Enclosing));
if (Q_UNLIKELY(FLAG(prop->category) & test))