summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2013-03-04 10:02:56 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-04 14:54:57 +0100
commit2f31bbd9ccd4d6e7e6ed1dd89ab5648f69a2e8b4 (patch)
tree371a9a7c6e8004561257fc153a0b4bc3cf2c3f96
parentc63e7f576609e90e7cb6d1b4c107182ae8c2d6c6 (diff)
Fix potential issue in QTBF itemization code
Since 5.0, script is QChar::Script which isn't of 1:1 mapping to HB_Script Change-Id: I2d88f929d7d3c3c994076a4e92ea22370962c41c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--src/corelib/tools/qunicodetools.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/tools/qunicodetools.cpp
index 0181e765f7..01aa1c4d52 100644
--- a/src/corelib/tools/qunicodetools.cpp
+++ b/src/corelib/tools/qunicodetools.cpp
@@ -611,7 +611,7 @@ Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length,
scriptItems.reserve(numItems);
int start = 0;
for (int i = start + 1; i < numItems; ++i) {
- if (items[i].script == items[start].script)
+ if (script_to_hbscript(items[i].script) == script_to_hbscript(items[start].script))
continue;
HB_ScriptItem item;
item.pos = items[start].position;