diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-21 13:40:57 +0200 |
|---|---|---|
| committer | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-22 09:47:49 +0200 |
| commit | 4efaf305f51d09e214645a18a7bfa62bc36e2c61 (patch) | |
| tree | 6454f785f42e1e2be1d1422f81e3bbe1ad8b1158 /src/plugins/platforms/xlib | |
| parent | 18c1d671371ef8d94506a9a6dd6ee3680ef80fd3 (diff) | |
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.
Diffstat (limited to 'src/plugins/platforms/xlib')
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibintegration.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibintegration.h | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xlib/xlib.pro | 2 |
3 files changed, 8 insertions, 3 deletions
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 <QtCore/qdebug.h> #include "qxlibwindow.h" -#include "qgenericunixfontdatabase.h" +#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> +#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h> #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 \ |