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

Conflicts:
	doc/global/template/style/online.css
	mkspecs/android-g++/qmake.conf

Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61

1 files changed, 0 insertions, 20 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 ca3f20f11b..34fc31b222 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java
@@ -88,26 +88,6 @@ public class QtSurface extends SurfaceView implements SurfaceHolder.Callback
     public void surfaceCreated(SurfaceHolder holder)
     {
         QtNative.setSurface(getId(), holder.getSurface(), getWidth(), getHeight());
-        // Initialize Accessibility
-        // The accessibility code depends on android API level 16, so dynamically resolve it
-        if (android.os.Build.VERSION.SDK_INT >= 16) {
-            try {
-                final String a11yDelegateClassName = "org.qtproject.qt5.android.accessibility.QtAccessibilityDelegate";
-                Class<?> qtDelegateClass = Class.forName(a11yDelegateClassName);
-                Constructor constructor = qtDelegateClass.getConstructor(Class.forName("android.view.View"));
-                m_accessibilityDelegate = constructor.newInstance(this);
-
-                Class a11yDelegateClass = Class.forName("android.view.View$AccessibilityDelegate");
-                Method setDelegateMethod = this.getClass().getMethod("setAccessibilityDelegate", a11yDelegateClass);
-                setDelegateMethod.invoke(this, m_accessibilityDelegate);
-            } catch (ClassNotFoundException e) {
-                // Class not found is fine since we are compatible with Android API < 16, but the function will
-                // only be available with that API level.
-            } catch (Exception e) {
-                // Unknown exception means something went wrong.
-                Log.w("Qt A11y", "Unknown exception: " + e.toString());
-            }
-        }
     }
 
     @Override