From fd218e6b2e23a70393b9324d87bf7907746396f7 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Tue, 2 Mar 2021 17:09:38 +0100
Subject: [PATCH] Qt6 incompatibilities fixed

---
 src/controls/QskGestureRecognizer.cpp | 2 +-
 src/controls/QskQuickItem.cpp         | 4 ++++
 src/controls/QskQuickItem.h           | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp
index 9f6d1ec8..8266deb7 100644
--- a/src/controls/QskGestureRecognizer.cpp
+++ b/src/controls/QskGestureRecognizer.cpp
@@ -57,7 +57,7 @@ static inline QMouseEvent* qskClonedMouseEvent(
 
 static void qskGrabTouchMouse( QQuickItem* item )
 {
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 )
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 ) && QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
     auto wd = QQuickWindowPrivate::get( item->window() );
 
     if ( wd->touchMouseDevice == nullptr )
diff --git a/src/controls/QskQuickItem.cpp b/src/controls/QskQuickItem.cpp
index 4a03d34f..2b04f196 100644
--- a/src/controls/QskQuickItem.cpp
+++ b/src/controls/QskQuickItem.cpp
@@ -860,11 +860,15 @@ void QskQuickItem::touchUngrabEvent()
     Inherited::touchUngrabEvent();
 }
 
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+
 void QskQuickItem::windowDeactivateEvent()
 {
     Inherited::windowDeactivateEvent();
 }
 
+#endif
+
 void QskQuickItem::updatePolish()
 {
     Q_D( QskQuickItem );
diff --git a/src/controls/QskQuickItem.h b/src/controls/QskQuickItem.h
index fef18461..2eab9251 100644
--- a/src/controls/QskQuickItem.h
+++ b/src/controls/QskQuickItem.h
@@ -133,7 +133,10 @@ class QSK_EXPORT QskQuickItem : public QQuickItem
 
     void mouseUngrabEvent() override; 
     void touchUngrabEvent() override;
+
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
     void windowDeactivateEvent() override;
+#endif
 
     void itemChange( ItemChange, const ItemChangeData& ) override;
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )