diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-05 06:04:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-05 06:04:12 (GMT) |
| commit | d6597781a658ba9546bc56f4f3079234c0790e1d (patch) | |
| tree | d42778afcf735084bad63a8239964eabdde467f1 /src/declarative/graphicsitems/qdeclarativetextinput.cpp | |
| parent | 80c04413ba2c1a20a5d93d69df92ba908c26d81d (diff) | |
| parent | dc4f8e4b23a4b07efe1605c2ae479e219b456df9 (diff) | |
| download | Qt-d6597781a658ba9546bc56f4f3079234c0790e1d.zip Qt-d6597781a658ba9546bc56f4f3079234c0790e1d.tar.gz Qt-d6597781a658ba9546bc56f4f3079234c0790e1d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index b04e36e..a1fa8c6 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -828,7 +828,7 @@ void QDeclarativeTextInput::moveCursor() } /*! - \qmlmethod int xToPosition(int x) + \qmlmethod int TextInput::xToPosition(int x) This function returns the character position at x pixels from the left of the textInput. Position 0 is before the @@ -1097,7 +1097,7 @@ QString QDeclarativeTextInput::displayText() const } /*! - \qmlmethod void moveCursorSelection(int position) + \qmlmethod void TextInput::moveCursorSelection(int position) Moves the cursor to \a position and updates the selection accordingly. (To only move the cursor, set the \l cursorPosition property.) |