From 4efaf305f51d09e214645a18a7bfa62bc36e2c61 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Tue, 21 Jun 2011 13:40:57 +0200 Subject: Add lighthouse event dispatcher API. Platform plugin creation is now moved forward in order to have a platform plugin instance at event dispatcher creation time. Plugins are now responsible for implementing PlatformIntegration::createEventDispatcher and returning an QAbstractEventDispatcher subclass. --- src/plugins/platforms/xlib/qxlibintegration.cpp | 8 ++++++-- src/plugins/platforms/xlib/qxlibintegration.h | 1 + src/plugins/platforms/xlib/xlib.pro | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/xlib') diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp index 02104d9f74..f659d439ec 100644 --- a/src/plugins/platforms/xlib/qxlibintegration.cpp +++ b/src/plugins/platforms/xlib/qxlibintegration.cpp @@ -45,7 +45,8 @@ #include #include "qxlibwindow.h" -#include "qgenericunixfontdatabase.h" +#include +#include #include "qxlibscreen.h" #include "qxlibclipboard.h" #include "qxlibdisplay.h" @@ -106,7 +107,10 @@ QPlatformWindow *QXlibIntegration::createPlatformWindow(QWidget *widget, WId /*w return new QXlibWindow(widget); } - +QAbstractEventDispatcher *QXlibIntegration::createEventDispatcher() const +{ + return createUnixEventDispatcher(); +} QPixmap QXlibIntegration::grabWindow(WId window, int x, int y, int width, int height) const { diff --git a/src/plugins/platforms/xlib/qxlibintegration.h b/src/plugins/platforms/xlib/qxlibintegration.h index 9c814ead69..ce5f35a41d 100644 --- a/src/plugins/platforms/xlib/qxlibintegration.h +++ b/src/plugins/platforms/xlib/qxlibintegration.h @@ -64,6 +64,7 @@ public: QPixmapData *createPixmapData(QPixmapData::PixelType type) const; QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const; QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const; + QAbstractEventDispatcher *createEventDispatcher() const; QPixmap grabWindow(WId window, int x, int y, int width, int height) const; diff --git a/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro index b6d0e0bf27..0c97d31f11 100644 --- a/src/plugins/platforms/xlib/xlib.pro +++ b/src/plugins/platforms/xlib/xlib.pro @@ -3,7 +3,7 @@ TARGET = qxlib load(qpa/plugin) DESTDIR = $$QT.gui.plugins/platforms -QT += core-private gui-private opengl-private +QT += core-private gui-private opengl-private platformsupport-private SOURCES = \ main.cpp \ -- cgit v1.2.3