From 1cd91a0ee58a653e7543dc01988d92adc89d3116 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Thu, 17 Aug 2017 09:31:43 +0300
Subject: Android: Fix compile using ndkr15 clang and unified headers

Add missing includes

Change-Id: I6fd58c9ebb5a8099c99928e3a7a0cbf3aa23ba43
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/plugins/platforms/android/androidjniinput.cpp | 1 +
 src/plugins/platforms/android/extract.cpp         | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/plugins/platforms/android')

diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp
index f19b7d5484..dc55ccd615 100644
--- a/src/plugins/platforms/android/androidjniinput.cpp
+++ b/src/plugins/platforms/android/androidjniinput.cpp
@@ -50,6 +50,7 @@
 
 #include <QGuiApplication>
 #include <QDebug>
+#include <math.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/android/extract.cpp b/src/plugins/platforms/android/extract.cpp
index e6636e37d4..2f2ffa7126 100644
--- a/src/plugins/platforms/android/extract.cpp
+++ b/src/plugins/platforms/android/extract.cpp
@@ -43,6 +43,7 @@
 #include <android/log.h>
 #include <extract.h>
 #include <alloca.h>
+#include <stdlib.h>
 
 #define LOG_TAG    "extractSyleInfo"
 #define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
-- 
cgit v1.2.3


From 4700a32f214eaa54ae4ddddd06936d6ca85dd72f Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Fri, 18 Aug 2017 14:11:37 +0200
Subject: Android: stop composing before pasting new text

We have to exit composition mode before inserting text. Otherwise, the
state of the input method will be out of sync with the contents of the
text editor.

Task-number: QTBUG-61717
Change-Id: I58bf3988ae9e0acf3302e810e46bb0ebeda30d17
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/plugins/platforms/android/qandroidinputcontext.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/plugins/platforms/android')

diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index 279cb338f4..7fa809f3f8 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -303,7 +303,7 @@ static jboolean paste(JNIEnv */*env*/, jobject /*thiz*/)
         return JNI_FALSE;
 
 #ifdef QT_DEBUG_ANDROID_IM_PROTOCOL
-    qDebug("@@@");
+    qDebug("@@@ PASTE");
 #endif
     return m_androidInputContext->paste();
 }
@@ -1138,6 +1138,7 @@ jboolean QAndroidInputContext::copyURL()
 
 jboolean QAndroidInputContext::paste()
 {
+    finishComposingText();
     m_cursorHandleShown = CursorHandleNotShown;
     sendShortcut(QKeySequence::Paste);
     return JNI_TRUE;
-- 
cgit v1.2.3