diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-27 01:47:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-27 01:47:10 (GMT) |
| commit | 415951891cd75170f1e4b89b46effa3319b56e4e (patch) | |
| tree | 98ee694cc8b78b997879fd64358d57d9158a60f6 /src | |
| parent | 7783b04aad1d90e84e6e66a6c99f6eeca97b1342 (diff) | |
| parent | 10830210607d08eeb2af5d091639506a7d8cc634 (diff) | |
| download | Qt-415951891cd75170f1e4b89b46effa3319b56e4e.zip Qt-415951891cd75170f1e4b89b46effa3319b56e4e.tar.gz Qt-415951891cd75170f1e4b89b46effa3319b56e4e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move the TextInput cursor delegate when the preedit position changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index ee241d6..6eb6b68 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -949,6 +949,8 @@ void QDeclarativeTextInput::setCursorDelegate(QDeclarativeComponent* c) //note that the components are owned by something else disconnect(d->control, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(moveCursor())); + disconnect(d->control, SIGNAL(updateMicroFocus()), + this, SLOT(moveCursor())); delete d->cursorItem; }else{ d->startCreatingCursor(); @@ -961,7 +963,9 @@ void QDeclarativeTextInputPrivate::startCreatingCursor() { Q_Q(QDeclarativeTextInput); q->connect(control, SIGNAL(cursorPositionChanged(int,int)), - q, SLOT(moveCursor())); + q, SLOT(moveCursor()), Qt::UniqueConnection); + q->connect(control, SIGNAL(updateMicroFocus()), + q, SLOT(moveCursor()), Qt::UniqueConnection); if(cursorComponent->isReady()){ q->createCursor(); }else if(cursorComponent->isLoading()){ |