1 files changed, 10 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 5245236..23c41e8 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -407,7 +407,11 @@ bool QDeclarativeTextInputPrivate::determineHorizontalAlignment()
     if (hAlignImplicit) {
         // if no explicit alignment has been set, follow the natural layout direction of the text
         QString text = control->text();
-        bool isRightToLeft = text.isEmpty() ? QApplication::keyboardInputDirection() == Qt::RightToLeft : text.isRightToLeft();
+        if (text.isEmpty())
+            text = control->preeditAreaText();
+        bool isRightToLeft = text.isEmpty()
+                ? QApplication::keyboardInputDirection() == Qt::RightToLeft
+                : text.isRightToLeft();
         return setHAlign(isRightToLeft ? QDeclarativeTextInput::AlignRight : QDeclarativeTextInput::AlignLeft);
     }
     return false;
@@ -1010,7 +1014,7 @@ int QDeclarativeTextInput::positionAt(int x) const
 
 /*!
     \qmlmethod int TextInput::positionAt(int x, CursorPosition position = CursorBetweenCharacters)
-    \since QtQuick 1.1
+    \since Quick 1.1
 
     This function returns the character position at
     x pixels from the left of the textInput. Position 0 is before the
@@ -1398,7 +1402,7 @@ QVariant QDeclarativeTextInput::inputMethodQuery(Qt::InputMethodQuery property)
 
 /*!
     \qmlmethod void TextInput::deselect()
-    \since QtQuick 1.1
+    \since Quick 1.1
 
     Removes active text selection.
 */
@@ -1570,7 +1574,7 @@ void QDeclarativeTextInput::setSelectByMouse(bool on)
 
 /*!
     \qmlproperty enum TextInput::mouseSelectionMode
-    \since QtQuick 1.1
+    \since Quick 1.1
 
     Specifies how text should be selected using a mouse.
 
@@ -1618,7 +1622,7 @@ void QDeclarativeTextInput::moveCursorSelection(int position)
 
 /*!
     \qmlmethod void TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters)
-    \since QtQuick 1.1
+    \since Quick 1.1
 
     Moves the cursor to \a position and updates the selection according to the optional \a mode
     parameter.  (To only move the cursor, set the \l cursorPosition property.)
@@ -1906,6 +1910,7 @@ void QDeclarativeTextInput::cursorPosChanged()
 void QDeclarativeTextInput::updateCursorRectangle()
 {
     Q_D(QDeclarativeTextInput);
+    d->determineHorizontalAlignment();
     d->updateHorizontalScroll();
     updateRect();//TODO: Only update rect between pos's
     updateMicroFocus();