Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	src/client/qwaylandinputdevice.cpp

Change-Id: I20fb102162351b714855258175ed00437e55f072

1 files changed, 2 insertions, 2 deletions

diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 19e36ccb..8c794dda 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -602,7 +602,7 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf
         invalidateFocus();
     }
     mFocus = window->waylandSurface();
-    connect(mFocus, &QObject::destroyed, this, &Pointer::handleFocusDestroyed);
+    connect(mFocus.data(), &QObject::destroyed, this, &Pointer::handleFocusDestroyed);
 
     mSurfacePos = QPointF(wl_fixed_to_double(sx), wl_fixed_to_double(sy));
     mGlobalPos = window->window()->mapToGlobal(mSurfacePos.toPoint());
@@ -774,7 +774,7 @@ void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time
 
 void QWaylandInputDevice::Pointer::invalidateFocus()
 {
-    disconnect(mFocus, &QObject::destroyed, this, &Pointer::handleFocusDestroyed);
+    disconnect(mFocus.data(), &QObject::destroyed, this, &Pointer::handleFocusDestroyed);
     mFocus = nullptr;
     mEnterSerial = 0;
 }