From fe2b1165ca836e2a8e6a2bfc4b618e55ab35758f Mon Sep 17 00:00:00 2001
From: Daven Sanassy <daven@vochlea.co.uk>
Date: Tue, 20 Dec 2022 17:31:22 +0000
Subject: [PATCH 1/3] Qt decided to change the interface for QVariant init

So this change complies with that interface, whilst supporting
older versions of Qt
---
 QuickPropertyMap/QuickPropertyMap.cpp | 51 +++++++++++++++------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/QuickPropertyMap/QuickPropertyMap.cpp b/QuickPropertyMap/QuickPropertyMap.cpp
index 72e5be3..0502d33 100644
--- a/QuickPropertyMap/QuickPropertyMap.cpp
+++ b/QuickPropertyMap/QuickPropertyMap.cpp
@@ -1,8 +1,8 @@
 #include "QuickPropertyMap.h"
 #include <private/qmetaobjectbuilder_p.h>
 
-QuickPropertyMap::QuickPropertyMap(QObject *parent)
-    : QuickPropertyMapBase(parent)
+QuickPropertyMap::QuickPropertyMap(QObject* parent) :
+    QuickPropertyMapBase(parent)
 {
     buildMetaObject(); // NOTE: build an empty valid QMetaObject
 }
@@ -15,7 +15,7 @@ QuickPropertyMap::~QuickPropertyMap()
 void QuickPropertyMap::addProperty(const QByteArray& name, const QVariant& value, int type)
 {
     if (!m_finalized)
-        m_propertyList.append(DynamicProperty{name, value, type});
+        m_propertyList.append(DynamicProperty { name, value, type });
 }
 
 void QuickPropertyMap::build()
@@ -57,10 +57,10 @@ void QuickPropertyMap::buildMetaObject()
     builder.setClassName("QuickPropertyMap");
     builder.setSuperClass(&QuickPropertyMapBase::staticMetaObject);
 
-    for (const DynamicProperty& dynamicProperty: m_propertyList)
+    for (const DynamicProperty& dynamicProperty : m_propertyList)
     {
         QMetaPropertyBuilder propertyBuilder = builder.addProperty(dynamicProperty.name, QMetaType::typeName(dynamicProperty.typeId));
-        QMetaMethodBuilder   signalBuilder   = builder.addSignal(dynamicProperty.name + "сhanged()");
+        QMetaMethodBuilder   signalBuilder = builder.addSignal(dynamicProperty.name + "сhanged()");
 
         propertyBuilder.setWritable(true);
         propertyBuilder.setNotifySignal(signalBuilder);
@@ -82,29 +82,34 @@ int QuickPropertyMap::my_metacall(QMetaObject::Call call, int id, void** argv)
 {
     switch (call)
     {
-        case QMetaObject::ReadProperty:
-        {
-            const DynamicProperty& property = m_propertyList[id];
-            QMetaType::construct(property.typeId, argv[0], property.value.data());
-        }
-        break;
+    case QMetaObject::ReadProperty:
+    {
+        const DynamicProperty& property = m_propertyList[id];
+        QMetaType::construct(property.typeId, argv[0], property.value.data());
+    }
+    break;
 
-        case QMetaObject::WriteProperty:
-        {
-            DynamicProperty& p = m_propertyList[id];
-            QVariant value(p.typeId, argv[0]);
+    case QMetaObject::WriteProperty:
+    {
+        DynamicProperty& p = m_propertyList[id];
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+        QVariant value(p.typeId, argv[0]);
+#else
+        QVariant value(QMetaType(p.typeId), argv[0]);
+#endif
 
-            if (p.value != value)
-            {
-                writeValue(p.value, value);
-                QMetaObject::activate(this, m_metaObject, id, nullptr);
+        if (p.value != value)
+        {
+            writeValue(p.value, value);
+            QMetaObject::activate(this, m_metaObject, id, nullptr);
 
-                emit valueChanged(p.name, p.value);
-            }
+            emit valueChanged(p.name, p.value);
         }
-        break;
+    }
+    break;
 
-        default: break;
+    default:
+        break;
     }
 
     return -1;

From f8d8262af2661da7c26edca8b71060d123839ad9 Mon Sep 17 00:00:00 2001
From: Daven Sanassy <daven@vochlea.co.uk>
Date: Wed, 26 Jul 2023 14:15:30 +0100
Subject: [PATCH 2/3] Fixes for linter

---
 Scene.qml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Scene.qml b/Scene.qml
index 3c812b3..fae95ed 100644
--- a/Scene.qml
+++ b/Scene.qml
@@ -1,3 +1,7 @@
+pragma ComponentBehavior: Bound
+
+// qmllint disable unqualified
+
 import QtQuick 2.0
 
 Rectangle {
@@ -62,3 +66,5 @@ Rectangle {
         }
     }
 }
+
+// qmllint enable unqualified

From 45b45d9b9b0adcaede41cf5a3e54882dd815311e Mon Sep 17 00:00:00 2001
From: Daven Sanassy <daven@vochlea.co.uk>
Date: Wed, 26 Jul 2023 14:16:49 +0100
Subject: [PATCH 3/3] Revert "Fixes for linter"

This reverts commit f8d8262af2661da7c26edca8b71060d123839ad9.
---
 Scene.qml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Scene.qml b/Scene.qml
index fae95ed..3c812b3 100644
--- a/Scene.qml
+++ b/Scene.qml
@@ -1,7 +1,3 @@
-pragma ComponentBehavior: Bound
-
-// qmllint disable unqualified
-
 import QtQuick 2.0
 
 Rectangle {
@@ -66,5 +62,3 @@ Rectangle {
         }
     }
 }
-
-// qmllint enable unqualified