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

Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d54be6d94381c72af28dda79cbc027d4

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e

1 files changed, 12 insertions, 1 deletions

diff --git a/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java b/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
index c2e2ea5b49..a4626b9bb1 100644
--- a/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
+++ b/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
@@ -53,6 +53,7 @@ import android.text.TextUtils;
 
 import android.view.accessibility.*;
 import android.view.MotionEvent;
+import android.view.View.OnHoverListener;
 
 import android.content.Context;
 
@@ -85,9 +86,19 @@ public class QtAccessibilityDelegate extends View.AccessibilityDelegate
     // the offset of the view on screen into account (eg status bar on top)
     private final int[] m_globalOffset = new int[2];
 
+    private class HoverEventListener implements View.OnHoverListener
+    {
+        @Override
+        public boolean onHover(View v, MotionEvent event)
+        {
+            return dispatchHoverEvent(event);
+        }
+    }
+
     public QtAccessibilityDelegate(View host)
     {
         m_view = host;
+        m_view.setOnHoverListener(new HoverEventListener());
         m_manager = (AccessibilityManager) host.getContext()
                 .getSystemService(Context.ACCESSIBILITY_SERVICE);
 
@@ -103,7 +114,7 @@ public class QtAccessibilityDelegate extends View.AccessibilityDelegate
 
     // For "explore by touch" we need all movement events here first
     // (user moves finger over screen to discover items on screen).
-    public boolean dispatchHoverEvent(MotionEvent event)
+    private boolean dispatchHoverEvent(MotionEvent event)
     {
         if (!m_manager.isTouchExplorationEnabled()) {
             return false;