summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandcompositor_p.h
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-03 12:40:19 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-04 16:12:47 +0200
commit4c5a796e96a66c18afbde0577d8b912a618fe710 (patch)
treee9b3aa53541f67d58dbf1599ae3181ac2cdae2ae /src/compositor/compositor_api/qwaylandcompositor_p.h
parenta814616ff34bf5901fc299c6ba91c80cad39922d (diff)
Make it possible to construct QWaylandOutput
This requires QWaylandOutput to be initialized. This will happend when the QWaylandCompositor of the QWaylandOutputSpace that is set on the QWaylandOutput is created. QWaylandCompositor will send or post a Polish event to the QWaylandOutput which again will call QWaylandOutput::initialize. This function will create the global that will be put on the wl_displays registry This makes it possible to Create WaylandOutputs in QML (see the pure-qml example) and also gives a better programming model in C++ Change-Id: Iaf907ae18a283678eda6d04390dc9790ae0bced8
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor_p.h')
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor_p.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index 2fcbb290c..6fa06c112 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -81,9 +81,6 @@ public:
QtWayland::DataDeviceManager *dataDeviceManager() const { return data_device_manager; }
void feedRetainedSelectionData(QMimeData *data);
- QWaylandOutput *callCreateOutput(QWaylandOutputSpace *outputSpace,
- QWindow *window)
- { return q_func()->createOutput(outputSpace, window); }
QWaylandPointer *callCreatePointerDevice(QWaylandInputDevice *inputDevice)
{ return q_func()->createPointerDevice(inputDevice); }
QWaylandKeyboard *callCreateKeyboardDevice(QWaylandInputDevice *inputDevice)