summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-08-16 08:52:29 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-08-16 09:06:52 (GMT)
commit2657bfa7c4de9f114331d1714a306b3999ae30d8 (patch)
treea4701ab57846cccce280a85324fe307650fc07f9 /src/gui/text
parent17a0782f2c0886ff19fc2c1a0bfbc96861ff2996 (diff)
downloadQt-2657bfa7c4de9f114331d1714a306b3999ae30d8.zip
Qt-2657bfa7c4de9f114331d1714a306b3999ae30d8.tar.gz
Qt-2657bfa7c4de9f114331d1714a306b3999ae30d8.tar.bz2
Fix bidi reordering of RTL text with embedded images
According to the UBA, the object replacement character should be considered ON. There's no reason to special case its directionality, as the bidi algorithm will already have given it an implicit directionality. Task-number: QTBUG-20910 Reviewed-by: Lars
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qtextengine.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 9301f16..9f148ee 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1534,8 +1534,6 @@ void QTextEngine::itemize() const
while (uc < e) {
switch (*uc) {
case QChar::ObjectReplacementCharacter:
- if (analysis->bidiLevel % 2)
- --analysis->bidiLevel;
analysis->script = QUnicodeTables::Common;
analysis->flags = QScriptAnalysis::Object;
break;