diff options
| author | Olivier Blin <olivier.blin@softathome.com> | 2015-05-04 20:55:20 +0200 |
|---|---|---|
| committer | Olivier Blin <qt@blino.org> | 2015-06-12 08:18:46 +0000 |
| commit | 3fce7d79108fef745cad6232417eff7db15f98e3 (patch) | |
| tree | fa4860d3182ca523abbd17d82381b8c751c50ec3 /src | |
| parent | dac4fcd9b03e2f4ac5e07cf36fcdd06951ab955e (diff) | |
Fix QWaylandDrag leak in the compositor
Make it a scoped pointer.
Change-Id: Iaeef87cad2022496ebe3a7c746b02584fac9a485
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlinputdevice.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlinputdevice_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/qwlinputdevice.cpp b/src/compositor/wayland_wrapper/qwlinputdevice.cpp index cb27ab4e4..ea127ee74 100644 --- a/src/compositor/wayland_wrapper/qwlinputdevice.cpp +++ b/src/compositor/wayland_wrapper/qwlinputdevice.cpp @@ -352,7 +352,7 @@ QWaylandInputDevice *InputDevice::handle() const QWaylandDrag *InputDevice::dragHandle() const { - return m_dragHandle; + return m_dragHandle.data(); } const DataDevice *InputDevice::dataDevice() const diff --git a/src/compositor/wayland_wrapper/qwlinputdevice_p.h b/src/compositor/wayland_wrapper/qwlinputdevice_p.h index 785c6d7e9..8444eaa50 100644 --- a/src/compositor/wayland_wrapper/qwlinputdevice_p.h +++ b/src/compositor/wayland_wrapper/qwlinputdevice_p.h @@ -128,7 +128,7 @@ public: private: QWaylandInputDevice *m_handle; - QWaylandDrag *m_dragHandle; + QScopedPointer<QWaylandDrag> m_dragHandle; Compositor *m_compositor; QWaylandInputDevice::CapabilityFlags m_capabilities; |