summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbintegration.cpp
diff options
context:
space:
mode:
authorMorten Johan Sorvig <morten.sorvig@nokia.com>2011-06-22 11:33:17 +0200
committerMorten Johan Sorvig <morten.sorvig@nokia.com>2011-06-22 11:37:42 +0200
commitf1975cfc53412c8ce82df5d857b0d435db53cec8 (patch)
tree67d2ef1babc0c88906e307871ae1e5761194e2c8 /src/plugins/platforms/xcb/qxcbintegration.cpp
parent407a6fe79824b722dbc1224a1be29d26b8fdb729 (diff)
Make xcb work again after event dispatcher changes.
The platform plugin/event dispatcher creation order has now been reversed and the event dispatcher cannot be accessed during plugin construciton.
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.cpp')
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 2513075f45..984c8afb9d 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -139,7 +139,9 @@ QPlatformBackingStore *QXcbIntegration::createPlatformBackingStore(QWindow *wind
QAbstractEventDispatcher *QXcbIntegration::createEventDispatcher() const
{
- return createUnixEventDispatcher();
+ QAbstractEventDispatcher *eventDispatcher = createUnixEventDispatcher();
+ m_connection->setEventDispatcher(eventDispatcher);
+ return eventDispatcher;
}
QList<QPlatformScreen *> QXcbIntegration::screens() const