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

Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b

1 files changed, 12 insertions, 0 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index 51688441e0..0e0072d234 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -191,6 +191,16 @@ public class QtNative
         }
     }
 
+    private static void runQtOnUiThread(final long id)
+    {
+        runAction(new Runnable() {
+            @Override
+            public void run() {
+                QtNative.onAndroidUiThread(id);
+            }
+        });
+    }
+
     public static boolean startApplication(String params,
                                            String environment,
                                            String mainLibrary,
@@ -618,4 +628,6 @@ public class QtNative
 
     // activity methods
     public static native void onActivityResult(int requestCode, int resultCode, Intent data);
+
+    public static native void onAndroidUiThread(long id);
 }