Merge pull request supercollider#6570 from dyfer/topic/treewidget-qt5

[qt5] QMetaType fix for Qt5
adcxyz · Dec 25, 2024 · 02c7e68 · 02c7e68
2 parents f9a797a + 5bec5c5
commit 02c7e68
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/QtCollider/QObjectProxy.cpp b/QtCollider/QObjectProxy.cpp
@@ -87,7 +87,11 @@ static bool serializeSignature(QVarLengthArray<char, 512>& dst, const char* meth
     int i;
     for (i = 0; i < argc; ++i) {
         int typeId = argv[i].type()->id();
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+        const char* typeName = QMetaType::typeName(typeId);
+#else
         const char* typeName = QMetaType(typeId).name();
+#endif
         int len = qstrlen(typeName);
         if (len <= 0) {
             qcErrorMsg("Could not get argument type name.");

diff --git a/QtCollider/QcObjectFactory.h b/QtCollider/QcObjectFactory.h
@@ -54,7 +54,11 @@ static void qcNoConstructorMsg(const QMetaObject* metaObject, int argc, QtCollid
         if (type) {
             if (i > 0)
                 str += ", ";
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+            str += QMetaType::typeName(type->id());
+#else
             str += QMetaType(type->id()).name();
+#endif
         } else
             break;
     }

diff --git a/QtCollider/metatype.hpp b/QtCollider/metatype.hpp
@@ -130,14 +130,22 @@ class MetaValue {
 
     QGenericArgument toGenericArgument() {
         if (mType)
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+            return QGenericArgument(QMetaType::typeName(mType->id()), mData);
+#else
             return QGenericArgument(QMetaType(mType->id()).name(), mData);
+#endif
         else
             return QGenericArgument();
     }
 
     QGenericReturnArgument toGenericReturnArgument() {
         if (mType)
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+            return QGenericReturnArgument(QMetaType::typeName(mType->id()), mData);
+#else
             return QGenericReturnArgument(QMetaType(mType->id()).name(), mData);
+#endif
         else
             return QGenericReturnArgument();
     }