aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktext.cpp
diff options
context:
space:
mode:
authorTasuku Suzuki <stasuku@gmail.com>2012-11-23 02:47:45 +0900
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-26 18:47:36 +0100
commite9e49c6157f7cfb84faeaab0438b0a30380f68f8 (patch)
tree3bbf70c61e46b808db18a3258025da260fc2c13b /src/quick/items/qquicktext.cpp
parentcedaf867421f4c43a2da712f00e9626e64c8b250 (diff)
Enable module build with QT_NO_IM
Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
-rw-r--r--src/quick/items/qquicktext.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 01136d56de..a1516ba6e5 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1750,7 +1750,11 @@ bool QQuickTextPrivate::setHAlign(QQuickText::HAlignment alignment, bool forceAl
bool QQuickTextPrivate::determineHorizontalAlignment()
{
if (hAlignImplicit) {
+#ifndef QT_NO_IM
bool alignToRight = text.isEmpty() ? qApp->inputMethod()->inputDirection() == Qt::RightToLeft : rightToLeftText;
+#else
+ bool alignToRight = rightToLeftText;
+#endif
return setHAlign(alignToRight ? QQuickText::AlignRight : QQuickText::AlignLeft);
}
return false;