diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-03 12:18:51 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-04 16:12:47 +0200 |
| commit | 81b320503251cb79e5500fbf7906586e0da01803 (patch) | |
| tree | d7c5ea957111b4f27d9d1c879a2d94c72eeb5e21 /examples | |
| parent | c4f2c0479fd992183ce04347111c5968dfd961bc (diff) | |
Move the curser surface signal to QWaylandInputDevice
Change-Id: Ib2b1ee81a5216e348e6014927c1cc818f848384b
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/pure-qml/qml/Screen.qml | 2 | ||||
| -rw-r--r-- | examples/wayland/qwindow-compositor/qwindowcompositor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/wayland/pure-qml/qml/Screen.qml b/examples/wayland/pure-qml/qml/Screen.qml index f29c3ee2f..1faaa2cce 100644 --- a/examples/wayland/pure-qml/qml/Screen.qml +++ b/examples/wayland/pure-qml/qml/Screen.qml @@ -70,7 +70,7 @@ Window { x: mouseTracker.mouseX - hotspotX y: mouseTracker.mouseY - hotspotY - compositor: screen.compositor + inputDevice: output.compositor.defaultInputDevice } } } diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp index 36b5d6816..8c97f1d55 100644 --- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp @@ -152,7 +152,7 @@ void QWindowCompositor::create() m_renderScheduler.setSingleShot(true); connect(&m_renderScheduler, &QTimer::timeout, this, &QWindowCompositor::render); connect(this, &QWaylandCompositor::surfaceCreated, this, &QWindowCompositor::onSurfaceCreated); - connect(this, &QWaylandCompositor::currentCurserSurfaceRequest, this, &QWindowCompositor::adjustCursorSurface); + connect(defaultInputDevice(), &QWaylandInputDevice::cursorSurfaceRequest, this, &QWindowCompositor::adjustCursorSurface); m_window->installEventFilter(this); |