aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2011-10-06 16:45:49 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-06 10:44:27 +0200
commitb801f90eb3679b567795416ceb821e7d2d2221ce (patch)
tree46ec92d1464013eb43b4eae9314ceb2ef4e4072d /src
parent8c51219a4db23a9402d03554d079798ae7c6fc98 (diff)
Fix for qsgtext autotests
Change-Id: If02d4cb69b4f729b85b47222c17a0b1642e649fb Reviewed-on: http://codereview.qt-project.org/6111 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qsgtext.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/items/qsgtext.cpp b/src/declarative/items/qsgtext.cpp
index 8e5ef7a7c6..735adb7114 100644
--- a/src/declarative/items/qsgtext.cpp
+++ b/src/declarative/items/qsgtext.cpp
@@ -1386,9 +1386,12 @@ void QSGText::setTextFormat(TextFormat format)
if (!wasRich && d->richText && isComponentComplete()) {
d->ensureDoc();
d->doc->setText(d->text);
+ d->rightToLeftText = d->doc->toPlainText().isRightToLeft();
d->richTextAsImage = enableImageCache();
+ } else {
+ d->rightToLeftText = d->text.isRightToLeft();
}
-
+ d->determineHorizontalAlignment();
d->updateLayout();
emit textFormatChanged(d->format);