1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp
index baf905f6d2..cbf13e81d5 100644
--- a/src/plugins/platforms/android/qandroidplatformintegration.cpp
+++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp
@@ -47,15 +47,14 @@
 #include <QThread>
 #include <QOffscreenSurface>
 
-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
 #include <QtPlatformSupport/private/qeglpbuffer_p.h>
-
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformoffscreensurface.h>
 
 #include "androidjnimain.h"
 #include "qabstracteventdispatcher.h"
+#include "qandroideventdispatcher.h"
 #include "qandroidplatformbackingstore.h"
 #include "qandroidplatformaccessibility.h"
 #include "qandroidplatformclipboard.h"
@@ -63,7 +62,6 @@
 #include "qandroidplatformfontdatabase.h"
 #include "qandroidplatformopenglcontext.h"
 #include "qandroidplatformopenglwindow.h"
-#include "qandroidplatformrasterwindow.h"
 #include "qandroidplatformscreen.h"
 #include "qandroidplatformservices.h"
 #include "qandroidplatformtheme.h"
@@ -193,6 +191,7 @@ bool QAndroidPlatformIntegration::hasCapability(Capability cap) const
                 return false;
             else
                 return true;
+        case RasterGLSurface: return true;
         default:
             return QPlatformIntegration::hasCapability(cap);
     }
@@ -228,15 +227,13 @@ QPlatformWindow *QAndroidPlatformIntegration::createPlatformWindow(QWindow *wind
 {
     if (window->type() == Qt::ForeignWindow)
         return new QAndroidPlatformForeignWindow(window);
-    else if (window->surfaceType() == QSurface::RasterSurface)
-        return new QAndroidPlatformRasterWindow(window);
     else
         return new QAndroidPlatformOpenGLWindow(window, m_eglDisplay);
 }
 
 QAbstractEventDispatcher *QAndroidPlatformIntegration::createEventDispatcher() const
 {
-    return createUnixEventDispatcher();
+    return new QAndroidEventDispatcher;
 }
 
 QAndroidPlatformIntegration::~QAndroidPlatformIntegration()