summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-10-14 22:00:12 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-10-14 22:00:12 (GMT)
commitca7a96943c122b8371caf98dc92f7e6644de1814 (patch)
tree4aaed5a7e0401455090ea0d92dd1ff26d86f09f7 /src/declarative
parentf103ad276181090da8c70bd29f4474ea7657e03f (diff)
parent9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff)
downloadQt-ca7a96943c122b8371caf98dc92f7e6644de1814.zip
Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.tar.gz
Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 637dd77..0903427 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1464,6 +1464,7 @@ void QDeclarativeTextInputPrivate::init()
void QDeclarativeTextInput::cursorPosChanged()
{
Q_D(QDeclarativeTextInput);
+ d->updateHorizontalScroll();
updateRect();//TODO: Only update rect between pos's
updateMicroFocus();
emit cursorPositionChanged();