Merge remote-tracking branch 'qt/5.6' into 5.7

Change-Id: Iada0e076ee33e8d39ecc4f40edfd9764ba610c03

1 files changed, 5 insertions, 0 deletions

diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 44a216580..8f0e32f6d 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -259,6 +259,8 @@ void QWaylandInputDevice::handleWindowDestroyed(QWaylandWindow *window)
         mKeyboard->mFocus = 0;
         mKeyboard->stopRepeat();
     }
+    if (mTouch && window == mTouch->mFocus)
+        mTouch->mFocus = 0;
 }
 
 void QWaylandInputDevice::setDataDevice(QWaylandDataDevice *device)
@@ -745,6 +747,9 @@ void QWaylandInputDevice::Touch::touch_down(uint32_t serial,
                                      wl_fixed_t x,
                                      wl_fixed_t y)
 {
+    if (!surface)
+        return;
+
     mParent->mTime = time;
     mParent->mSerial = serial;
     mFocus = QWaylandWindow::fromWlSurface(surface);