sync: from linuxdeepin/dtkcore

Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#414
linuxdeepin · May 13, 2024 · c630cfa · c630cfa
1 parent 6b84162
commit c630cfa
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -717,12 +717,20 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
 
         for (const QString &annotation : annotations) {
             if (annotation.indexOf('<') != -1) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                cs << "    if (QMetaType::fromName(\"" << annotation << "\").id() == QMetaType::UnknownType) {" << endl;
+#else
                 cs << "    if (QMetaType::type(\"" << annotation << "\") == QMetaType::UnknownType) {" << endl;
+#endif
                 cs << "        qRegisterMetaType< " << annotation << " >(\"" << annotation << "\");" << endl;
                 cs << "        qDBusRegisterMetaType< " << annotation << " >();" << endl;
                 cs << "    }" << endl;
             } else {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                cs << "    if (QMetaType::fromName(\"" << annotation << "\").id() == QMetaType::UnknownType)" << endl;
+#else
                 cs << "    if (QMetaType::type(\"" << annotation << "\") == QMetaType::UnknownType)" << endl;
+#endif
                 cs << "        register" << annotation << "MetaType();" << endl;
             }
         }