summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/wayland/qwaylandintegration.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-01-25 16:01:21 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-01-26 13:16:10 (GMT)
commitd36a3a6ebc17935371cfca2a9f22dcd683205b5b (patch)
treeca5cf1c79d99bab9594b8c6607469adcaa485854 /src/plugins/platforms/wayland/qwaylandintegration.cpp
parent2d65cd502fb5508426748d9ef7af4697051f1c45 (diff)
downloadQt-d36a3a6ebc17935371cfca2a9f22dcd683205b5b.zip
Qt-d36a3a6ebc17935371cfca2a9f22dcd683205b5b.tar.gz
Qt-d36a3a6ebc17935371cfca2a9f22dcd683205b5b.tar.bz2
Lighthouse: Wayland. Make the wayland integration closer to Lighthosue
Today there is a connection between QWidget and QPlatformScreen. So I added a accessor in QWaylandScreen to get the corresponding QWaylandDisplay. So now it should be possible to have different QWaylandDisplays. But also its possible to use the internal Lighthouse api closer in the wayland plugin if that should be of interest ;)
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandintegration.cpp')
-rw-r--r--src/plugins/platforms/wayland/qwaylandintegration.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index e647880..02bc680 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -80,7 +80,7 @@ QPixmapData *QWaylandIntegration::createPixmapData(QPixmapData::PixelType type)
QPlatformWindow *QWaylandIntegration::createPlatformWindow(QWidget *widget, WId winId) const
{
Q_UNUSED(winId);
- return new QWaylandWindow(widget, mDisplay);
+ return new QWaylandWindow(widget);
}
QWindowSurface *QWaylandIntegration::createWindowSurface(QWidget *widget, WId winId) const
@@ -89,8 +89,8 @@ QWindowSurface *QWaylandIntegration::createWindowSurface(QWidget *widget, WId wi
Q_UNUSED(winId);
if (mUseOpenGL)
- return new QWaylandDrmWindowSurface(widget, mDisplay);
- return new QWaylandShmWindowSurface(widget, mDisplay);
+ return new QWaylandDrmWindowSurface(widget);
+ return new QWaylandShmWindowSurface(widget);
}
QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const