diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:51:06 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:51:06 +0200 |
commit | dcbd6c64049682fb6cff0e73a5fdd979de7642dd (patch) | |
tree | 70bcc90ab270f07e4a75e5be7ba6083fe64871b8 | |
parent | 8c80dd6a9893c6e323ae69b651efd7b629b2714c (diff) | |
parent | 8e7fa2b5aa2e2e4371c4b73926d0e6ad2ebdbd96 (diff) | |
download | qtquick1-dcbd6c64049682fb6cff0e73a5fdd979de7642dd.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 0369c051..d9ab86bf 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -1174,13 +1174,16 @@ void QDeclarativeTextInput::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (qAbs(int(event->pos().x() - d->pressPos.x())) > QApplication::startDragDistance()) setKeepMouseGrab(true); +#ifndef QT_NO_IM if (d->control->composeMode()) { // start selection int startPos = d->xToPos(d->pressPos.x()); int currentPos = d->xToPos(event->pos().x()); if (startPos != currentPos) d->control->setSelection(startPos, currentPos - startPos); - } else { + } else +#endif + { moveCursorSelection(d->xToPos(event->pos().x()), d->mouseSelectionMode); } event->setAccepted(true); |