Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452

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);