3 files changed, 25 insertions, 5 deletions
diff --git a/src/plugins/platforms/android/androidjniclipboard.cpp b/src/plugins/platforms/android/androidjniclipboard.cpp
index 17ff0e0bbb..833996403c 100644
--- a/src/plugins/platforms/android/androidjniclipboard.cpp
+++ b/src/plugins/platforms/android/androidjniclipboard.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "androidjniclipboard.h"
-#include "androidjnimain.h"
 #include <QtCore/private/qjni_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,10 +45,23 @@ QT_BEGIN_NAMESPACE
 using namespace QtAndroid;
 namespace QtAndroidClipboard
 {
-    void setClipboardListener(QAndroidPlatformClipboard *listener)
+    QAndroidPlatformClipboard *m_manager = nullptr;
+
+    static char const *const QtNativeClassName = "org/qtproject/qt5/android/QtNative";
+    static JNINativeMethod methods[] = {
+        {"onClipboardDataChanged", "()V", (void *)onClipboardDataChanged}
+    };
+
+    void setClipboardManager(QAndroidPlatformClipboard *manager)
     {
-        Q_UNUSED(listener);
+        m_manager = manager;
         QJNIObjectPrivate::callStaticMethod<void>(applicationClass(), "registerClipboardManager");
+        jclass appClass = QtAndroid::applicationClass();
+        QJNIEnvironmentPrivate env;
+        if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {
+            __android_log_print(ANDROID_LOG_FATAL,"Qt", "RegisterNatives failed");
+            return;
+        }
     }
 
     void setClipboardText(const QString &text)
@@ -73,6 +85,11 @@ namespace QtAndroidClipboard
                                                                            "()Ljava/lang/String;");
         return text.toString();
     }
+
+    void onClipboardDataChanged(JNIEnv */*env*/, jobject /*thiz*/)
+    {
+        m_manager->emitChanged(QClipboard::Clipboard);
+    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/androidjniclipboard.h b/src/plugins/platforms/android/androidjniclipboard.h
index 9de6dc1f44..2ec566e729 100644
--- a/src/plugins/platforms/android/androidjniclipboard.h
+++ b/src/plugins/platforms/android/androidjniclipboard.h
@@ -41,6 +41,8 @@
 #define ANDROIDJNICLIPBOARD_H
 
 #include <QString>
+#include "qandroidplatformclipboard.h"
+#include "androidjnimain.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -48,10 +50,11 @@ class QAndroidPlatformClipboard;
 namespace QtAndroidClipboard
 {
     // Clipboard support
-    void setClipboardListener(QAndroidPlatformClipboard *listener);
+    void setClipboardManager(QAndroidPlatformClipboard *manager);
     void setClipboardText(const QString &text);
     bool hasClipboardText();
     QString clipboardText();
+    void onClipboardDataChanged(JNIEnv */*env*/, jobject /*thiz*/);
     // Clipboard support
 }
 
diff --git a/src/plugins/platforms/android/qandroidplatformclipboard.cpp b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
index a2bc802680..dc5147b259 100644
--- a/src/plugins/platforms/android/qandroidplatformclipboard.cpp
+++ b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 QAndroidPlatformClipboard::QAndroidPlatformClipboard()
 {
-    QtAndroidClipboard::setClipboardListener(this);
+    QtAndroidClipboard::setClipboardManager(this);
 }
 
 QMimeData *QAndroidPlatformClipboard::mimeData(QClipboard::Mode mode)