From 9f189119daff26d33ca99b88c29fb54718d34c36 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 9 Dec 2020 12:44:08 +0100 Subject: [PATCH] Qt 6.0 incompatibilities fixed --- src/controls/QskGestureRecognizer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp index 0d50cbdd..9cac30b0 100644 --- a/src/controls/QskGestureRecognizer.cpp +++ b/src/controls/QskGestureRecognizer.cpp @@ -14,7 +14,7 @@ QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_END static QMouseEvent* qskClonedMouseEventAt( - const QMouseEvent *event, QPointF *localPos ) + const QMouseEvent* event, QPointF* localPos ) { #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) @@ -22,12 +22,14 @@ static QMouseEvent* qskClonedMouseEventAt( const_cast< QMouseEvent* >( event ), localPos ); #else - auto clonedEvent = new QMouseEvent( *event ); + auto clonedEvent = event->clone(); auto& point = QMutableEventPoint::from( clonedEvent->point( 0 ) ); point.detach(); point.setTimestamp( event->timestamp() ); - point.setPosition( localPos ? *localPos : event->position() ); + + if ( localPos ) + point.setPosition( *localPos ); #endif return clonedEvent;