2 files changed, 5 insertions, 10 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 4def0de8f..f6287ba8f 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -272,14 +272,8 @@ QWaylandInputDevice::Touch *QWaylandInputDevice::createTouch(QWaylandInputDevice
 
 void QWaylandInputDevice::handleWindowDestroyed(QWaylandWindow *window)
 {
-    if (mPointer && window == mPointer->mFocus)
-        mPointer->mFocus = 0;
-    if (mKeyboard && window == mKeyboard->mFocus) {
-        mKeyboard->mFocus = 0;
+    if (mKeyboard && window == mKeyboard->mFocus)
         mKeyboard->stopRepeat();
-    }
-    if (mTouch && window == mTouch->mFocus)
-        mTouch->mFocus = 0;
 }
 
 void QWaylandInputDevice::handleEndDrag()
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
index 9e3d1d1f4..adff3f113 100644
--- a/src/client/qwaylandinputdevice_p.h
+++ b/src/client/qwaylandinputdevice_p.h
@@ -71,6 +71,7 @@
 #endif
 
 #include <QtCore/QDebug>
+#include <QPointer>
 
 #if QT_CONFIG(cursor)
 struct wl_cursor_image;
@@ -202,7 +203,7 @@ public:
                             uint32_t group) override;
 
     QWaylandInputDevice *mParent;
-    QWaylandWindow *mFocus;
+    QPointer<QWaylandWindow> mFocus;
 #if QT_CONFIG(xkbcommon_evdev)
     xkb_context *mXkbContext;
     xkb_keymap *mXkbMap;
@@ -253,7 +254,7 @@ public:
     void releaseButtons();
 
     QWaylandInputDevice *mParent;
-    QWaylandWindow *mFocus;
+    QPointer<QWaylandWindow> mFocus;
     uint32_t mEnterSerial;
 #if QT_CONFIG(cursor)
     uint32_t mCursorSerial;
@@ -293,7 +294,7 @@ public:
     void releasePoints();
 
     QWaylandInputDevice *mParent;
-    QWaylandWindow *mFocus;
+    QPointer<QWaylandWindow> mFocus;
     QList<QWindowSystemInterface::TouchPoint> mTouchPoints;
     QList<QWindowSystemInterface::TouchPoint> mPrevTouchPoints;
 };