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

Conflicts:
	src/corelib/tools/qbytearray.cpp
	src/gui/image/qimage.cpp
	src/gui/image/qppmhandler.cpp
	src/gui/kernel/qguiapplication.cpp
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765

1 files changed, 20 insertions, 19 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 014023ecb1..aba4cfa502 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -397,25 +397,6 @@ public class QtNative
         });
     }
 
-    private static boolean isSoftwareKeyboardVisible()
-    {
-        final Semaphore semaphore = new Semaphore(0);
-        final Boolean[] ret = {false};
-        runAction(new Runnable() {
-            @Override
-            public void run() {
-                ret[0] = m_activityDelegate.isSoftwareKeyboardVisible();
-                semaphore.release();
-            }
-        });
-        try {
-            semaphore.acquire();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return ret[0];
-    }
-
     private static void setFullScreen(final boolean fullScreen)
     {
         runAction(new Runnable() {
@@ -556,6 +537,26 @@ public class QtNative
         });
     }
 
+    private static void bringChildToFront(final int id)
+    {
+        runAction(new Runnable() {
+            @Override
+            public void run() {
+                m_activityDelegate.bringChildToFront(id);
+            }
+        });
+    }
+
+    private static void bringChildToBack(final int id)
+    {
+        runAction(new Runnable() {
+            @Override
+            public void run() {
+                m_activityDelegate.bringChildToBack(id);
+            }
+        });
+    }
+
     private static void destroySurface(final int id)
     {
         runAction(new Runnable() {