summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetext.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-03 14:54:21 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-04 12:48:20 +0200
commitbac91185a71c2109e28ada138031890fc15e1105 (patch)
treefcd0ab61fe618ca7dac9648f53648db89c1e01f7 /src/declarative/graphicsitems/qdeclarativetext.cpp
parent6be319d40f7d02cf31007d7cda2c2a0d9d1a1334 (diff)
QApplication::keyboardInputDirection is deprecated.
Get the direction from the input method. Change-Id: I81c567e0db4787b6f38a4b0446959b85f441625d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index a94cb14b..e668d4f7 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -1117,7 +1117,8 @@ bool QDeclarativeTextPrivate::determineHorizontalAlignment()
{
Q_Q(QDeclarativeText);
if (hAlignImplicit && q->isComponentComplete()) {
- bool alignToRight = text.isEmpty() ? QApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText;
+ Qt::LayoutDirection direction = qApp->inputMethod()->inputDirection();
+ bool alignToRight = text.isEmpty() ? direction == Qt::RightToLeft : rightToLeftText;
return setHAlign(alignToRight ? QDeclarativeText::AlignRight : QDeclarativeText::AlignLeft);
}
return false;