From 3dc4b9ac86968c6a921c546a44c1929ad6684473 Mon Sep 17 00:00:00 2001
From: Steffen Imhof <steffen.imhof@basyskom.com>
Date: Tue, 17 Jun 2014 09:46:17 +0200
Subject: Move animation-related header out of QT_NO_IM #ifndef.

Change-Id: I7f0bfed4ff9a608575cf6795016b2fa134fd273f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/widgets/widgets/qlineedit_p.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/widgets/widgets')

diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index a4394ae92b..bafc5352fb 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -55,8 +55,8 @@
 #ifndef QT_NO_IM
 #include "qinputmethod.h"
 #include "qlist.h"
-#include <qpropertyanimation.h>
 #endif
+#include <qpropertyanimation.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3


From 7f8f476244e551b224b56c7f2bff128bc4d873b8 Mon Sep 17 00:00:00 2001
From: Steffen Imhof <steffen.imhof@basyskom.com>
Date: Tue, 17 Jun 2014 09:51:07 +0200
Subject: Compile fix for QT_NO_IM in QtWidgets

Added some #ifdef guards around usages of composeMode().

Change-Id: If2f2d3cae21b270933b38ea67dcc885f5871785f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/widgets/widgets/qlineedit.cpp          | 7 ++++++-
 src/widgets/widgets/qwidgetlinecontrol.cpp | 2 ++
 src/widgets/widgets/qwidgetlinecontrol_p.h | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/widgets/widgets')

diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index ba4dbcc878..f1c884e77f 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -1528,13 +1528,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);
             }
         }
@@ -1585,6 +1588,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();
@@ -1609,6 +1613,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e)
                 position += (sizeChange - preeditLength);
             }
         }
+#endif
 
         if (position >= 0)
             d->control->selectWordAtPos(position);
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index 75f30599be..e459171e62 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -187,6 +187,7 @@ void QWidgetLineControl::paste(QClipboard::Mode clipboardMode)
 */
 void QWidgetLineControl::commitPreedit()
 {
+#ifndef QT_NO_IM
     if (!composeMode())
         return;
 
@@ -198,6 +199,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 1cee67bfd2..5ce1d0ed56 100644
--- a/src/widgets/widgets/qwidgetlinecontrol_p.h
+++ b/src/widgets/widgets/qwidgetlinecontrol_p.h
@@ -221,8 +221,10 @@ public:
     }
     void setText(const QString &txt)
     {
+#ifndef QT_NO_IM
         if (composeMode())
             qApp->inputMethod()->reset();
+#endif
         internalSetText(txt, -1, false);
     }
     void commitPreedit();
-- 
cgit v1.2.3