diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-07-27 16:54:53 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-28 10:06:11 +0200 |
commit | dfd72c6e6c5aab58bd56c8f7854e94df2230bd8d (patch) | |
tree | 72cd4bc3aca6135e8be267aaa7aedefd04a7d908 /src/plugins/platforms/wayland/qwaylandintegration.h | |
parent | b6b853b1b64175c191e776ffbf297bdc9de0a0fd (diff) |
Make QPlatformIntegration not have a factory for eventdispatcher
but rather an accessor for the guiThreadEventDispatcher
Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413
Reviewed-on: http://codereview.qt.nokia.com/2321
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandintegration.h')
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration.h index 3c8b996f14..209d5da0da 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.h +++ b/src/plugins/platforms/wayland/qwaylandintegration.h @@ -59,7 +59,8 @@ public: QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformGLContext *createPlatformGLContext(const QSurfaceFormat &glFormat, QPlatformGLContext *share) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; - QAbstractEventDispatcher *createEventDispatcher() const; + + QAbstractEventDispatcher *guiThreadEventDispatcher() const; QList<QPlatformScreen *> screens() const; @@ -73,6 +74,7 @@ public: private: QPlatformFontDatabase *mFontDb; + QAbstractEventDispatcher *mEventDispatcher; QWaylandDisplay *mDisplay; QPlatformNativeInterface *mNativeInterface; }; |