summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qlinecontrol_p.h
diff options
context:
space:
mode:
authorPekka Vuorela <pekka.ta.vuorela@nokia.com>2012-01-05 13:29:23 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-07 17:25:59 +0100
commita98741516c02bbc1f479300d08a39fb5f93e1d64 (patch)
tree7dc52f76f910628f36d4955b4fb321675a5842b9 /src/gui/text/qlinecontrol_p.h
parenta2fd2f90ec6f17715cff5b7e954c31b5356db649 (diff)
Move keyboard locale and input direction to QInputPanel
Deprecated QGuiApplication::keyboardInputLocale() and keyboardInputDirection(), introduced QInputPanel::locale() and inputDirection(). Change-Id: Ic48c77f10821a949751c73c73f22bd78e2192b9c Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/text/qlinecontrol_p.h')
-rw-r--r--src/gui/text/qlinecontrol_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qlinecontrol_p.h b/src/gui/text/qlinecontrol_p.h
index 166300f997..fb14df27bb 100644
--- a/src/gui/text/qlinecontrol_p.h
+++ b/src/gui/text/qlinecontrol_p.h
@@ -277,7 +277,7 @@ public:
Qt::LayoutDirection layoutDirection() const {
if (m_layoutDirection == Qt::LayoutDirectionAuto) {
if (m_text.isEmpty())
- return QGuiApplication::keyboardInputDirection();
+ return qApp->inputPanel()->inputDirection();
return m_text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight;
}
return m_layoutDirection;