From 96e210ce3ccf0436235c7358f37b874a50b0d32f Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Sun, 6 Feb 2022 14:32:26 +0100
Subject: [PATCH] Qt 6.3 ( beta1 ) incompatibilities fixed

---
 src/controls/QskGestureRecognizer.cpp | 22 ++++++++++++++++++----
 src/controls/QskMenu.cpp              |  6 ++----
 src/controls/QskQuickItemPrivate.cpp  | 15 +++++++--------
 src/controls/QskQuickItemPrivate.h    |  2 --
 src/graphic/QskGraphic.cpp            |  2 +-
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp
index da7d726e..cd15a1f5 100644
--- a/src/controls/QskGestureRecognizer.cpp
+++ b/src/controls/QskGestureRecognizer.cpp
@@ -14,6 +14,10 @@ QSK_QT_PRIVATE_BEGIN
 #include <private/qquickwindow_p.h>
 QSK_QT_PRIVATE_END
 
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 3, 0 )
+#include <private/qeventpoint_p.h>
+#endif
+
 static QMouseEvent* qskClonedMouseEventAt(
     const QMouseEvent* event, QPointF* localPos )
 {
@@ -25,13 +29,23 @@ static QMouseEvent* qskClonedMouseEventAt(
 #else
     auto clonedEvent = event->clone();
 
-    auto& point = QMutableEventPoint::from( clonedEvent->point( 0 ) );
-    point.detach();
-    point.setTimestamp( event->timestamp() );
-
     if ( localPos )
+    {
+#if QT_VERSION < QT_VERSION_CHECK( 6, 3, 0 )
+        auto& point = QMutableEventPoint::from( clonedEvent->point( 0 ) );
+
+        point.detach();
         point.setPosition( *localPos );
+#else
+        auto& point = clonedEvent->point( 0 );
+
+        QMutableEventPoint::detach( point );
+        QMutableEventPoint::setPosition( point, *localPos );
 #endif
+    }
+#endif
+
+    Q_ASSERT(  event->timestamp() == clonedEvent->timestamp() );
 
     return clonedEvent;
 }
diff --git a/src/controls/QskMenu.cpp b/src/controls/QskMenu.cpp
index 2955fb95..e6ae839d 100644
--- a/src/controls/QskMenu.cpp
+++ b/src/controls/QskMenu.cpp
@@ -25,8 +25,6 @@ namespace
     class Option
     {
       public:
-        Option() = default; // some compilers need this
-
         Option( const QUrl& graphicSource, const QString& text )
             : graphicSource( graphicSource )
             , text( text )
@@ -35,8 +33,8 @@ namespace
                 graphic = Qsk::loadGraphic( graphicSource );
         }
 
-        const QUrl graphicSource;
-        const QString text;
+        QUrl graphicSource;
+        QString text;
 
         QskGraphic graphic;
     };
diff --git a/src/controls/QskQuickItemPrivate.cpp b/src/controls/QskQuickItemPrivate.cpp
index fcad0f3b..9b9297be 100644
--- a/src/controls/QskQuickItemPrivate.cpp
+++ b/src/controls/QskQuickItemPrivate.cpp
@@ -240,12 +240,11 @@ void QskQuickItemPrivate::cleanupNodes()
     }
 }
 
-QSGTransformNode* QskQuickItemPrivate::createTransformNode()
-{
-    return Inherited::createTransformNode();
-}
+/*
+    Can we do something useful with overloading:
 
-void QskQuickItemPrivate::transformChanged()
-{
-    Inherited::transformChanged();
-}
+        - QQuickItemPrivate::createTransformNode
+        - QQuickItemPrivate::transformChanged
+
+    TODO ...
+ */
diff --git a/src/controls/QskQuickItemPrivate.h b/src/controls/QskQuickItemPrivate.h
index 160fbf6e..305c3ebc 100644
--- a/src/controls/QskQuickItemPrivate.h
+++ b/src/controls/QskQuickItemPrivate.h
@@ -29,8 +29,6 @@ class QskQuickItemPrivate : public QQuickItemPrivate
     virtual void implicitSizeChanged();
 
   private:
-    QSGTransformNode* createTransformNode() override;
-    void transformChanged() override;
 
     void cleanupNodes();
     void mirrorChange() override;
diff --git a/src/graphic/QskGraphic.cpp b/src/graphic/QskGraphic.cpp
index e4d01578..2705baf7 100644
--- a/src/graphic/QskGraphic.cpp
+++ b/src/graphic/QskGraphic.cpp
@@ -177,7 +177,7 @@ static inline void qskExecCommand(
             if ( data->flags & QPaintEngine::DirtyHints )
             {
 #if 1
-                auto state = QPainterPrivate::get( painter )->state;
+                auto& state = QPainterPrivate::get( painter )->state;
                 state->renderHints = data->renderHints;
 
                 // to trigger internal updates we have to set at least one flag