Add support for Qt 6.5HEADdev

Change-Id: I5dd88d1f01b77b833f8d141ea689f7647ea420c7
Reviewed-by: Dominik Holland <[email protected]>

7 files changed, 56 insertions, 34 deletions

diff --git a/am-config-neptune.yaml b/am-config-neptune.yaml
index d173756c..9c1054f5 100644
--- a/am-config-neptune.yaml
+++ b/am-config-neptune.yaml
@@ -74,7 +74,9 @@ logging:
     - "qml*=true"
     - "cursor.navigation=false"
     - "qt3ds.*=false"
-    - "shared.com.pelagicore.map.info=false"
     - "*.info=true"
+    - "shared.com.pelagicore.map.info=false"
+    - "qt.qml.overloadresolution.info=false"
+    - "qt.qml.binding.removal.info=false"
     - "*.warning=true"
     - "*.critical=true"
diff --git a/neptune3-ui.pro b/neptune3-ui.pro
index 12cebc29..d953ae65 100644
--- a/neptune3-ui.pro
+++ b/neptune3-ui.pro
@@ -13,29 +13,29 @@ requires(qtHaveModule(appman_main-private))
     log("$$escape_expand(\\n\\n) *** The qtsaferenderer module or tools are not available: Make sure that QtSafeRenderer is installed and configured correctly ***$$escape_expand(\\n\\n)")
 }
 
-!qtHaveModule(studio3d){
+disable-studio3d|!qtHaveModule(studio3d){
     log("$$escape_expand(\\n\\n)[Warning] The studio3d optional module is not available. $$escape_expand(\\n)[Warning] Neptune 3 UI can't show some 3D content made with Qt 3D Studio without this module.$$escape_expand(\\n)[Warning] To show this content install the ogl-runtime.$$escape_expand(\\n\\n)")
 }
 
+TEMPLATE = subdirs
+CONFIG *= ordered
+SUBDIRS = src
+
 enable-examples {
-    NEPTUNE3-UI_BUILD_PARTS = $$QT_BUILD_PARTS
-    NEPTUNE3-UI_BUILD_PARTS *= examples
+    SUBDIRS *= examples
 }
 
 enable-tests {
-    NEPTUNE3-UI_BUILD_PARTS = $$QT_BUILD_PARTS
-    NEPTUNE3-UI_BUILD_PARTS *= tests
+    SUBDIRS *= tests
 }
 
-load(qt_parts)
-
 include(config.pri)
 
 SUBDIRS += plugins
 SUBDIRS += doc
 
 copydata.file = copydata.pro
-copydata.depends += sub_src
+copydata.depends += src
 copydata.depends += plugins
 SUBDIRS += copydata
 
diff --git a/plugins/sizes/Sizes.cpp b/plugins/sizes/Sizes.cpp
index 3a646b2b..d6fbc4b5 100644
--- a/plugins/sizes/Sizes.cpp
+++ b/plugins/sizes/Sizes.cpp
@@ -35,9 +35,6 @@
 #include <QtGui/QGuiApplication>
 #include <QQmlEngine>
 
-#include <QtQuickControls2/private/qquickstyle_p.h>
-
-
 
 class StyleData {
 public:
@@ -80,10 +77,10 @@ public:
 static StyleData GlobalStyleData;
 
 Sizes::Sizes(QObject *parent)
-    : QQuickAttachedObject(parent)
+    : QQuickAttachedPropertyPropagator(parent)
     , m_data(new StyleData(GlobalStyleData))
 {
-    init();
+    initialize();
 }
 
 Sizes::~Sizes()
@@ -130,13 +127,13 @@ int Sizes::fontSizeXXL() const
     return qRound(m_data->fontSizeXXL * m_data->scale);
 }
 
-void Sizes::init()
+void Sizes::initialize()
 {
     m_data.reset(new StyleData(GlobalStyleData));
-    QQuickAttachedObject::init();
+    QQuickAttachedPropertyPropagator::initialize();
 }
 
-void Sizes::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
+void Sizes::attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent)
 {
     Q_UNUSED(oldParent)
     Sizes* neptune = qobject_cast<Sizes *>(newParent);
@@ -181,7 +178,7 @@ void Sizes::setScale(qreal value)
 
 void Sizes::propagateScale()
 {
-    for (QQuickAttachedObject *child : attachedChildren()) {
+    for (QQuickAttachedPropertyPropagator *child : attachedChildren()) {
         Sizes* neptune = qobject_cast<Sizes *>(child);
         if (neptune && !qFuzzyCompare(neptune->scale(), m_data->scale))
             neptune->setScale(m_data->scale);
diff --git a/plugins/sizes/Sizes.h b/plugins/sizes/Sizes.h
index bc8af3c9..05c057bb 100644
--- a/plugins/sizes/Sizes.h
+++ b/plugins/sizes/Sizes.h
@@ -35,12 +35,23 @@
 #include <QtCore/QSharedPointer>
 #include <QtCore/QScopedPointer>
 #include <QJSValue>
+#include <QQmlEngine>
 
-#include <QtQuickControls2Impl/private/qquickattachedobject_p.h>
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+#  include <QtQuickControls2/private/qquickstyle_p.h>
+class QQuickAttachedPropertyPropagator : public QQuickAttachedObject
+{
+protected:
+    void initialize() { QQuickAttachedObject::init(); }
+};
+
+#else
+#  include <QtQuickControls2/QQuickAttachedPropertyPropagator>
+#endif
 
 class StyleData;
 
-class Sizes : public QQuickAttachedObject
+class Sizes : public QQuickAttachedPropertyPropagator
 {
     Q_OBJECT
 
@@ -96,7 +107,7 @@ public:
     QJSValue dp() const;
 
 protected:
-    void init();
+    void initialize();
 signals:
     void scaleChanged();
 
@@ -105,7 +116,7 @@ private:
     mutable QJSValue m_dp;
 
 protected:
-    void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override;
+    void attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent) override;
     void inheritStyle(const StyleData &data);
     void propagateStyle(const StyleData &data);
     void propagateScale();
diff --git a/plugins/style/Style.cpp b/plugins/style/Style.cpp
index c5c4f937..d25748ca 100644
--- a/plugins/style/Style.cpp
+++ b/plugins/style/Style.cpp
@@ -40,9 +40,9 @@
 #include <QtQml/qqmlinfo.h>
 
 Style::Style(QObject *parent)
-    : QQuickAttachedObject(parent)
+    : QQuickAttachedPropertyPropagator(parent)
 {
-    init();
+    initialize();
 }
 
 Style::~Style()
@@ -55,15 +55,15 @@ Style *Style::qmlAttachedProperties(QObject *object)
     return new Style(object);
 }
 
-void Style::init()
+void Style::initialize()
 {
     m_theme = StyleDefaults::instance()->data().theme;
     m_accentColor = StyleDefaults::instance()->dataFromTheme(m_theme).accentColor;
 
-    QQuickAttachedObject::init();
+    QQuickAttachedPropertyPropagator::initialize();
 }
 
-void Style::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
+void Style::attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent)
 {
     Q_UNUSED(oldParent);
     Style* parentStyle = qobject_cast<Style *>(newParent);
@@ -125,7 +125,7 @@ bool Style::supportsMultipleThemes() const
 
 void Style::propagateAccentColor()
 {
-    for (QQuickAttachedObject *child : attachedChildren()) {
+    for (QQuickAttachedPropertyPropagator *child : attachedChildren()) {
         Style* basicStyle = qobject_cast<Style *>(child);
         if (basicStyle)
             basicStyle->setAccentColor(m_accentColor);
@@ -134,7 +134,7 @@ void Style::propagateAccentColor()
 
 void Style::propagateTheme()
 {
-    for (QQuickAttachedObject *child : attachedChildren()) {
+    for (QQuickAttachedPropertyPropagator *child : attachedChildren()) {
         Style* basicStyle = qobject_cast<Style *>(child);
         if (basicStyle)
             basicStyle->setTheme(static_cast<Theme>(m_theme));
diff --git a/plugins/style/Style.h b/plugins/style/Style.h
index c3f5ca55..995abbeb 100644
--- a/plugins/style/Style.h
+++ b/plugins/style/Style.h
@@ -33,10 +33,22 @@
 
 #include "StyleData.h"
 
-#include <QtQuickControls2Impl/private/qquickattachedobject_p.h>
 #include <QJSValue>
+#include <QQmlEngine>
 
-class Style : public QQuickAttachedObject
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+#  include <QtQuickControls2/private/qquickstyle_p.h>
+class QQuickAttachedPropertyPropagator : public QQuickAttachedObject
+{
+protected:
+    void initialize() { QQuickAttachedObject::init(); }
+};
+
+#else
+#  include <QtQuickControls2/QQuickAttachedPropertyPropagator>
+#endif
+
+class Style : public QQuickAttachedPropertyPropagator
 {
     Q_OBJECT
     Q_PROPERTY(Theme theme READ theme WRITE setTheme NOTIFY themeChanged FINAL)
@@ -120,8 +132,8 @@ public:
     QJSValue image();
 
 protected:
-    void init();
-    void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override;
+    void initialize();
+    void attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent) override;
 
 signals:
     void accentColorChanged();
diff --git a/src/neptune-cluster-app/neptune-cluster-app.pro b/src/neptune-cluster-app/neptune-cluster-app.pro
index 5efe8590..05b87b2c 100644
--- a/src/neptune-cluster-app/neptune-cluster-app.pro
+++ b/src/neptune-cluster-app/neptune-cluster-app.pro
@@ -9,7 +9,7 @@ isEmpty(INSTALL_PREFIX) {
 }
 
 # check ogl-runtime
-qtHaveModule(studio3d) {
+!disable-studio3d:qtHaveModule(studio3d) {
     QT *= studio3d
     DEFINES *= STUDIO3D_RUNTIME_INSTALLED
 }