Fix call to QMetaObject::invokeMethod in Qt 6.5

Author: AdrianEddy

qmetaobject/src/qtdeclarative.rs

@@ -29,7 +29,7 @@ cpp! {{
     #include <QtQuick/QtQuick>
     #include <QtCore/QDebug>
     #include <QtQml/QQmlComponent>
-    
+
     #ifdef NO_WIDGETS
     # define QAPPLICATION QGuiApplication
     # include <QtGui/QGuiApplication>
@@ -206,6 +206,8 @@ impl QmlEngine {
         let args_size = args.len();
         let args_ptr = args.as_ptr();
 
+        assert!(args_size <= 9);
+
         cpp!(unsafe [
             self as "QmlEngineHolder *",
             name as "QByteArray",
@@ -219,23 +221,23 @@ impl QmlEngine {
             }
             QVariant ret;
             #if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
-                QMetaMethodArgument args[9] = {};
+                #define INVOKE_METHOD(...) QMetaObject::invokeMethod(robjs.first(), name, qReturnArg(ret), __VA_ARGS__);
             #else
-                QGenericArgument args[9] = {};
+                #define INVOKE_METHOD(...) QMetaObject::invokeMethod(robjs.first(), name, Q_RETURN_ARG(QVariant, ret), __VA_ARGS__);
             #endif
-            for (uint i = 0; i < args_size; ++i) {
-                args[i] = Q_ARG(QVariant, args_ptr[i]);
+            switch (args_size) {
+                case 0: INVOKE_METHOD() break;
+                case 1: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0])); break;
+                case 2: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1])); break;
+                case 3: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1]), Q_ARG(QVariant, args_ptr[2])); break;
+                case 4: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1]), Q_ARG(QVariant, args_ptr[2]), Q_ARG(QVariant, args_ptr[3])); break;
+                case 5: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1]), Q_ARG(QVariant, args_ptr[2]), Q_ARG(QVariant, args_ptr[3]), Q_ARG(QVariant, args_ptr[4])); break;
+                case 6: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1]), Q_ARG(QVariant, args_ptr[2]), Q_ARG(QVariant, args_ptr[3]), Q_ARG(QVariant, args_ptr[4]), Q_ARG(QVariant, args_ptr[5])); break;
+                case 7: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1]), Q_ARG(QVariant, args_ptr[2]), Q_ARG(QVariant, args_ptr[3]), Q_ARG(QVariant, args_ptr[4]), Q_ARG(QVariant, args_ptr[5]), Q_ARG(QVariant, args_ptr[6])); break;
+                case 8: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1]), Q_ARG(QVariant, args_ptr[2]), Q_ARG(QVariant, args_ptr[3]), Q_ARG(QVariant, args_ptr[4]), Q_ARG(QVariant, args_ptr[5]), Q_ARG(QVariant, args_ptr[6]), Q_ARG(QVariant, args_ptr[7])); break;
+                case 9: INVOKE_METHOD(Q_ARG(QVariant, args_ptr[0]), Q_ARG(QVariant, args_ptr[1]), Q_ARG(QVariant, args_ptr[2]), Q_ARG(QVariant, args_ptr[3]), Q_ARG(QVariant, args_ptr[4]), Q_ARG(QVariant, args_ptr[5]), Q_ARG(QVariant, args_ptr[6]), Q_ARG(QVariant, args_ptr[7]), Q_ARG(QVariant, args_ptr[8])); break;
             }
-            QMetaObject::invokeMethod(
-                robjs.first(),
-                name,
-                #if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
-                    qReturnArg(ret),
-                #else
-                    Q_RETURN_ARG(QVariant, ret),
-                #endif
-                args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]
-            );
+            #undef INVOKE_METHOD
             return ret;
         })
     }