1 files changed, 19 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp
index 636a2b3853..286d4cc7f2 100644
--- a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp
+++ b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp
@@ -50,6 +50,7 @@
 #include "qandroidplatformservices.h"
 #include "qandroidplatformfontdatabase.h"
 #include "qandroidplatformclipboard.h"
+#include "qandroidplatformaccessibility.h"
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
 
 #ifndef ANDROID_PLUGIN_OPENGL
@@ -66,6 +67,7 @@
 #endif
 
 #include "qandroidplatformtheme.h"
+#include "qandroidsystemlocale.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -86,6 +88,9 @@ void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteA
 
 QAndroidPlatformIntegration::QAndroidPlatformIntegration(const QStringList &paramList)
     : m_touchDevice(0)
+#ifndef QT_NO_ACCESSIBILITY
+    , m_accessibility(0)
+#endif
 {
     Q_UNUSED(paramList);
 
@@ -108,13 +113,17 @@ QAndroidPlatformIntegration::QAndroidPlatformIntegration(const QStringList &para
     m_androidFDB = new QAndroidPlatformFontDatabase();
     m_androidPlatformServices = new QAndroidPlatformServices();
     m_androidPlatformClipboard = new QAndroidPlatformClipboard();
+
+    m_androidSystemLocale = new QAndroidSystemLocale;
 }
 
 bool QAndroidPlatformIntegration::hasCapability(Capability cap) const
 {
     switch (cap) {
         case ThreadedPixmaps: return true;
+        case ApplicationState: return true;
         case NonFullScreenWindows: return false;
+        case NativeWidgets: return false;
         default:
 #ifndef ANDROID_PLUGIN_OPENGL
         return QPlatformIntegration::hasCapability(cap);
@@ -184,6 +193,7 @@ QAndroidPlatformIntegration::~QAndroidPlatformIntegration()
 {
     delete m_androidPlatformNativeInterface;
     delete m_androidFDB;
+    delete m_androidSystemLocale;
     QtAndroid::setAndroidPlatformIntegration(NULL);
 }
 QPlatformFontDatabase *QAndroidPlatformIntegration::fontDatabase() const
@@ -255,6 +265,15 @@ void QAndroidPlatformIntegration::setDefaultDesktopSize(int gw, int gh)
     m_defaultGeometryHeight = gh;
 }
 
+#ifndef QT_NO_ACCESSIBILITY
+QPlatformAccessibility *QAndroidPlatformIntegration::accessibility() const
+{
+    if (!m_accessibility)
+        m_accessibility = new QAndroidPlatformAccessibility();
+    return m_accessibility;
+}
+#endif
+
 
 #ifndef ANDROID_PLUGIN_OPENGL
 void QAndroidPlatformIntegration::setDesktopSize(int width, int height)