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

Change-Id: I2d373d538df3a65ac2d41238e5c6a214a151be68

2 files changed, 2 insertions, 2 deletions

diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 9f30810a9..895cbc49a 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -60,7 +60,7 @@ QMouseHandlerPrivate::QMouseHandlerPrivate()
     m_shareable = false;
     m_pressAndHoldTimer->setSingleShot(true);
     m_pressAndHoldTimer->setInterval(500);
-    QObject::connect(m_pressAndHoldTimer.data(), &QTimer::timeout, [this] {
+    QObject::connect(m_pressAndHoldTimer, &QTimer::timeout, [this] {
         emit q_func()->pressAndHold(m_lastPressedEvent.data());
     });
 }
diff --git a/src/input/frontend/qmousehandler_p.h b/src/input/frontend/qmousehandler_p.h
index 3b2f2284d..6c7f8b204 100644
--- a/src/input/frontend/qmousehandler_p.h
+++ b/src/input/frontend/qmousehandler_p.h
@@ -74,7 +74,7 @@ public:
 
     QMouseDevice *m_mouseDevice;
     bool m_containsMouse;
-    QScopedPointer<QTimer> m_pressAndHoldTimer;
+    QTimer *m_pressAndHoldTimer = nullptr;
     QMouseEventPtr m_lastPressedEvent;
 
     void mouseEvent(const QMouseEventPtr &event);