diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-17 12:32:48 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-18 14:48:57 +0000 |
| commit | d9e0249e064bdeef545a95c64d54ac56b73833f3 (patch) | |
| tree | d3b88ebc90ead049e919d04f87a5dfa0f99e7a42 /src/compositor/compositor_api/qwaylandcompositor.cpp | |
| parent | 07dffc46ff14a745df020a987c2a17fbfd90d6fe (diff) | |
Simplify the construction of pure-qml
Make it possible that an WaylandOutput item is declared as a child of a
WaylandCompositor item. This is mostly usefull for examples, since
output handling will likely be event driven in a propper compositor
Change-Id: I3238b079e41a49f69cbd9255818588674b364fb2
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index cae304f5b..8d6815924 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -301,6 +301,7 @@ void QWaylandCompositorPrivate::initializeDefaultInputDevice() { Q_Q(QWaylandCompositor); inputDevices.append(q->createInputDevice()); + q->defaultInputDeviceChanged(); } void QWaylandCompositorPrivate::loadClientBufferIntegration() @@ -528,7 +529,9 @@ void QWaylandCompositor::overrideSelection(const QMimeData *data) QWaylandInputDevice *QWaylandCompositor::defaultInputDevice() const { Q_D(const QWaylandCompositor); - return d->inputDevices.first(); + if (d->inputDevices.size()) + return d->inputDevices.first(); + return Q_NULLPTR; } QWaylandInputDevice *QWaylandCompositor::inputDeviceFor(QInputEvent *inputEvent) |