Merge branch '1.2'

CMakeLists.txt

@@ -147,8 +147,8 @@ macro(set_compiler_flags targetName)
 endmacro()
 
 if(${PROJECT_NAME}_QTQUICK)
-  find_package(Qt5Quick)
-  find_package(Qt5QuickControls2)
+  find_package(Qt${QT_MAJOR_VERSION}Quick)
+  find_package(Qt${QT_MAJOR_VERSION}QuickControls2)
   add_definitions(-DKDDOCKWIDGETS_QTQUICK)
 else()
   add_definitions(-DKDDOCKWIDGETS_QTWIDGETS)

CMakePresets.json

@@ -71,6 +71,33 @@
                 "KDDockWidgets_STATIC": "ON",
                 "KDDockWidgets_QTQUICK": "ON"
             }
+        },
+        {
+            "name": "qtwidgets6",
+            "displayName": "qtwidgets6",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-qtwidgets6",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "KDDockWidgets_QT6": "ON"
+            },
+            "environment": {
+                "PATH": "$env{HOME}/Qt/6.0.0/gcc_64/bin:$penv{PATH}"
+            }
+        },
+        {
+            "name": "qtquick6",
+            "displayName": "qtquick6",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-qtquick6",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "KDDockWidgets_QTQUICK": "ON",
+                 "KDDockWidgets_QT6": "ON"
+            },
+            "environment": {
+                "PATH": "$env{HOME}/Qt/6.0.0/gcc_64/bin:$penv{PATH}"
+            }
         }
     ]
-}
+}

src/Qt5Qt6Compat_p.h

@@ -20,6 +20,8 @@ namespace Qt5Qt6Compat {
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 
+#define QQUICKITEMgeometryChanged geometryChange
+
 using QEnterEvent = QEnterEvent;
 using qintptr = ::qintptr;
 using qhashtype = size_t;
@@ -34,8 +36,9 @@ inline QPoint eventGlobalPos(QMouseEvent *ev)
     return ev->globalPosition().toPoint();
 }
 
-#else
-// Qt 5:
+#else // Qt 5:
+
+#define QQUICKITEMgeometryChanged geometryChanged
 
 using QEnterEvent = QEvent;
 using qintptr = long;

src/private/indicators/ClassicIndicatorsWindow_p.h

@@ -13,6 +13,7 @@
 #define KD_INDICATORS_CLASSICINDICATORS_WINDOW_P_H
 
 #include "DropIndicatorOverlayInterface_p.h"
+#include "ClassicIndicators_p.h"
 
 #ifdef KDDOCKWIDGETS_QTWIDGETS
 

src/private/quick/QWidgetAdapter_quick.cpp

@@ -116,10 +116,10 @@ void QWidgetAdapter::itemChange(QQuickItem::ItemChange change, const QQuickItem:
     }
 }
 
-void QWidgetAdapter::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QWidgetAdapter::QQUICKITEMgeometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     // Send a few events manually, since QQuickItem doesn't do it for us.
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::QQUICKITEMgeometryChanged(newGeometry, oldGeometry);
 
     // Not calling event() directly, otherwise it would skip event filters
 

src/private/quick/QWidgetAdapter_quick_p.h

@@ -22,6 +22,7 @@
 #define KDDOCKWIDGETS_QWIDGETADAPTERQUICK_P_H
 
 #include "../../docks_export.h"
+#include "kddockwidgets/Qt5Qt6Compat_p.h"
 
 #include <QQuickItem>
 #include <QObject>
@@ -178,7 +179,7 @@ protected:
     void create();
     bool event(QEvent *) override;
     bool eventFilter(QObject *, QEvent *) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void QQUICKITEMgeometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void raiseAndActivate();
     virtual bool onResize(QSize newSize);
     virtual void onLayoutRequest();