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

Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e

4 files changed, 11 insertions, 2 deletions

diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index dfc9a8fe92..cf294e3c34 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -1520,13 +1520,16 @@ void QLineEdit::mouseMoveEvent(QMouseEvent * e)
 #else
             const bool select = (d->imHints & Qt::ImhNoPredictiveText);
 #endif
+#ifndef QT_NO_IM
             if (d->control->composeMode() && select) {
                 int startPos = d->xToPos(d->mousePressPos.x());
                 int currentPos = d->xToPos(e->pos().x());
                 if (startPos != currentPos)
                     d->control->setSelection(startPos, currentPos - startPos);
 
-            } else {
+            } else
+#endif
+            {
                 d->control->moveCursor(d->xToPos(e->pos().x()), select);
             }
         }
@@ -1577,6 +1580,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e)
         int position = d->xToPos(e->pos().x());
 
         // exit composition mode
+#ifndef QT_NO_IM
         if (d->control->composeMode()) {
             int preeditPos = d->control->cursor();
             int posInPreedit = position - d->control->cursor();
@@ -1601,6 +1605,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e)
                 position += (sizeChange - preeditLength);
             }
         }
+#endif
 
         if (position >= 0)
             d->control->selectWordAtPos(position);
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index 0731c89094..f1126322d8 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -47,8 +47,8 @@
 #ifndef QT_NO_IM
 #include "qinputmethod.h"
 #include "qlist.h"
-#include <qpropertyanimation.h>
 #endif
+#include <qpropertyanimation.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index a82dd99591..e6385ba390 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -179,6 +179,7 @@ void QWidgetLineControl::paste(QClipboard::Mode clipboardMode)
 */
 void QWidgetLineControl::commitPreedit()
 {
+#ifndef QT_NO_IM
     if (!composeMode())
         return;
 
@@ -190,6 +191,7 @@ void QWidgetLineControl::commitPreedit()
     setPreeditArea(-1, QString());
     m_textLayout.clearAdditionalFormats();
     updateDisplayText(/*force*/ true);
+#endif
 }
 
 
diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h
index 328faf7926..f21d88177c 100644
--- a/src/widgets/widgets/qwidgetlinecontrol_p.h
+++ b/src/widgets/widgets/qwidgetlinecontrol_p.h
@@ -228,8 +228,10 @@ public:
     }
     void setText(const QString &txt)
     {
+#ifndef QT_NO_IM
         if (composeMode())
             qApp->inputMethod()->reset();
+#endif
         internalSetText(txt, -1, false);
     }
     void commitPreedit();