From 3fce7d79108fef745cad6232417eff7db15f98e3 Mon Sep 17 00:00:00 2001
From: Olivier Blin <olivier.blin@softathome.com>
Date: Mon, 4 May 2015 20:55:20 +0200
Subject: Fix QWaylandDrag leak in the compositor

Make it a scoped pointer.

Change-Id: Iaeef87cad2022496ebe3a7c746b02584fac9a485
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 src/compositor/wayland_wrapper/qwlinputdevice.cpp | 2 +-
 src/compositor/wayland_wrapper/qwlinputdevice_p.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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;
 
-- 
cgit v1.2.3