summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-28 03:44:41 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-28 03:44:41 (GMT)
commit0051bb56146eb7214371e3a9fa8eeae8f4f1db96 (patch)
tree4a11dc203736f685dc4fb78184f7ef7ba3dcfb9c /src
parenta74086946666378f07505f1cd2d873e85fa5791b (diff)
parent7a89d94c208347635fa0ad5c4da9bca4a9398f5c (diff)
downloadQt-0051bb56146eb7214371e3a9fa8eeae8f4f1db96.zip
Qt-0051bb56146eb7214371e3a9fa8eeae8f4f1db96.tar.gz
Qt-0051bb56146eb7214371e3a9fa8eeae8f4f1db96.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 43812b6..775450a 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1122,7 +1122,7 @@ QString QDeclarativeTextInput::displayText() const
void QDeclarativeTextInput::moveCursorSelection(int position)
{
Q_D(QDeclarativeTextInput);
- d->control->moveCursor(pos, true);
+ d->control->moveCursor(position, true);
}
void QDeclarativeTextInputPrivate::init()