From 43aaab280862bf73ef05ad419b260511798c47f5 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 3 Feb 2014 14:31:14 +0100 Subject: [PATCH] init mTouchDevice to null Since QWaylandInputDevice::seat_capabilities checks the pointer before creating this object, it must be initially null so that the device will be registered. Change-Id: Ia15b407b1636eab41c04f30bb631306095e5aefb Reviewed-by: Laszlo Agocs --- src/plugins/platforms/wayland/qwaylandinputdevice.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp index 46054128d5a..08e2945741b 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp @@ -232,6 +232,7 @@ QWaylandInputDevice::QWaylandInputDevice(QWaylandDisplay *display, uint32_t id) , mTouch(0) , mTime(0) , mSerial(0) + , mTouchDevice(0) { if (mQDisplay->dndSelectionHandler()) { mDataDevice = mQDisplay->dndSelectionHandler()->getDataDevice(this);