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, 0 insertions, 18 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java b/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java
index 45a80a3dbb..ca3f20f11b 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java
@@ -110,24 +110,6 @@ public class QtSurface extends SurfaceView implements SurfaceHolder.Callback
         }
     }
 
-    public boolean dispatchHoverEvent(MotionEvent event) {
-        // Always attempt to dispatch hover events to accessibility first.
-        if (m_accessibilityDelegate != null) {
-            try {
-                Method dispHoverA11y = m_accessibilityDelegate.getClass().getMethod("dispatchHoverEvent", MotionEvent.class);
-                boolean ret = (Boolean) dispHoverA11y.invoke(m_accessibilityDelegate, event);
-                if (ret)
-                    return true;
-                SurfaceView view = (SurfaceView) this;
-                Method dispHoverView = view.getClass().getMethod("dispatchHoverEvent", MotionEvent.class);
-                return (Boolean) dispHoverView.invoke(view, event);
-            } catch (Exception e) {
-                Log.w("Qt A11y", "EXCEPTION in dispatchHoverEvent for Accessibility: " + e);
-            }
-        }
-        return false;
-    }
-
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
     {