qt6: Update to handle QMetaProperty::isUser change.

The qt6 version of this function no longer accepts an argument.
MythTV · Dec 8, 2021 · 8c19737 · 8c19737
1 parent 00be2aa
commit 8c19737
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/mythtv/libs/libmythbase/http/serialisers/mythcborserialiser.cpp b/mythtv/libs/libmythbase/http/serialisers/mythcborserialiser.cpp
@@ -109,7 +109,13 @@ void MythCBORSerialiser::AddQObject(const QObject* Object)
     for (int index = 0; index  < count; ++index  )
     {
         QMetaProperty metaProperty = metaobject->property(index);
-        if (metaProperty.isUser(Object))
+        if (
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+            metaProperty.isUser(Object)
+#else
+            metaProperty.isUser()
+#endif
+            )
         {
             const char *rawname = metaProperty.name();
             QString name(rawname);

diff --git a/mythtv/libs/libmythbase/http/serialisers/mythjsonserialiser.cpp b/mythtv/libs/libmythbase/http/serialisers/mythjsonserialiser.cpp
@@ -90,7 +90,13 @@ void MythJSONSerialiser::AddQObject(const QObject* Object)
     for (int index = 0; index  < count; ++index  )
     {
         QMetaProperty metaProperty = metaobject->property(index);
-        if (metaProperty.isUser(Object))
+        if (
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+            metaProperty.isUser(Object)
+#else
+            metaProperty.isUser()
+#endif
+            )
         {
             const char *rawname = metaProperty.name();
             QString name(rawname);

diff --git a/mythtv/libs/libmythbase/http/serialisers/mythserialiser.cpp b/mythtv/libs/libmythbase/http/serialisers/mythserialiser.cpp
@@ -80,7 +80,12 @@ HTTPData MythSerialiser::Serialise(const QString &Name, const QVariant& Value, c
             for (int ix = 0; ix  < count; ++ix  )
             {
                 QMetaProperty metaproperty = meta->property(ix);
-                if (metaproperty.isUser(Object))
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+                bool user = metaproperty.isUser(Object);
+#else
+                bool user = metaproperty.isUser();
+#endif
+                if (user)
                 {
                     const char *rawname = metaproperty.name();
                     QString name(rawname);

diff --git a/mythtv/libs/libmythbase/http/serialisers/mythxmlplistserialiser.cpp b/mythtv/libs/libmythbase/http/serialisers/mythxmlplistserialiser.cpp
@@ -133,7 +133,13 @@ void MythXMLPListSerialiser::AddQObject(const QString &Name, const QObject* Obje
     for (int index = 0; index  < count; ++index  )
     {
         QMetaProperty metaproperty = meta->property(index);
-        if (metaproperty.isUser(Object))
+        if (
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+            metaproperty.isUser(Object)
+#else
+            metaproperty.isUser()
+#endif
+            )
         {
             const char *rawname = metaproperty.name();
             QString name(rawname);

diff --git a/mythtv/libs/libmythbase/http/serialisers/mythxmlserialiser.cpp b/mythtv/libs/libmythbase/http/serialisers/mythxmlserialiser.cpp
@@ -93,7 +93,13 @@ void MythXMLSerialiser::AddQObject(const QObject* Object)
     for (int index = 0; index  < count; ++index  )
     {
         QMetaProperty metaproperty = meta->property(index);
-        if (metaproperty.isUser(Object))
+        if (
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+            metaproperty.isUser(Object)
+#else
+            metaproperty.isUser()
+#endif
+            )
         {
             const char *rawname = metaproperty.name();
             QString name(rawname);