1 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 61f1d2513b..ed8e42faf4 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -46,15 +46,17 @@
 #include "qdirectfbcursor.h"
 #include "qdirectfbwindow.h"
 
-#include "qgenericunixfontdatabase.h"
+#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
+#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
 
 #include <private/qwindowsurface_raster_p.h>
 #include <private/qpixmap_raster_p.h>
 
 #include <QtGui/private/qpixmap_blitter_p.h>
-#include <QtGui/private/qpixmapdata_p.h>
+#include <QtGui/qplatformpixmap_qpa.h>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QThread>
+#include <QtCore/QAbstractEventDispatcher>
 
 QT_BEGIN_NAMESPACE
 
@@ -116,12 +118,12 @@ QDirectFbIntegration::~QDirectFbIntegration()
     delete mInput;
 }
 
-QPixmapData *QDirectFbIntegration::createPixmapData(QPixmapData::PixelType type) const
+QPlatformPixmap *QDirectFbIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const
 {
-    if (type == QPixmapData::BitmapType)
-        return new QRasterPixmapData(type);
+    if (type == QPlatformPixmap::BitmapType)
+        return new QRasterPlatformPixmap(type);
     else
-        return new QDirectFbBlitterPixmapData;
+        return new QDirectFbBlitterPlatformPixmap;
 }
 
 QPlatformWindow *QDirectFbIntegration::createPlatformWindow(QWidget *widget, WId winId) const
@@ -131,6 +133,11 @@ QPlatformWindow *QDirectFbIntegration::createPlatformWindow(QWidget *widget, WId
     return new QDirectFbWindow(widget,input);
 }
 
+QAbstractEventDispatcher *QDirectFbIntegration::createEventDispatcher() const
+{
+    return createUnixEventDispatcher();
+}
+
 QWindowSurface *QDirectFbIntegration::createWindowSurface(QWidget *widget, WId winId) const
 {
     return new QDirectFbWindowSurface(widget,winId);