1 files changed, 24 insertions, 29 deletions
diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp
index e46153551..10c1b5a56 100644
--- a/src/quick3d/quick3dinput/items/quick3daction.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daction.cpp
@@ -52,37 +52,32 @@ Quick3DAction::Quick3DAction(QObject *parent)
 
 QQmlListProperty<QAbstractActionInput> Quick3DAction::qmlActionInputs()
 {
-    return QQmlListProperty<QAbstractActionInput>(this, 0,
-                                        &Quick3DAction::appendActionInput,
-                                        &Quick3DAction::actionInputCount,
-                                        &Quick3DAction::actionInputAt,
-                                        &Quick3DAction::clearActionInputs);
-}
-
-void Quick3DAction::appendActionInput(QQmlListProperty<QAbstractActionInput> *list, QAbstractActionInput *input)
-{
-    Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
-    action->parentAction()->addInput(input);
-}
-
-QAbstractActionInput *Quick3DAction::actionInputAt(QQmlListProperty<QAbstractActionInput> *list, qsizetype index)
-{
-    Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
-    return action->parentAction()->inputs().at(index);
-}
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    using qt_size_type = qsizetype;
+#else
+    using qt_size_type = int;
+#endif
 
-qsizetype Quick3DAction::actionInputCount(QQmlListProperty<QAbstractActionInput> *list)
-{
-    Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
-    return action->parentAction()->inputs().count();
-}
+    auto appendFunction = [](QQmlListProperty<QAbstractActionInput> *list, QAbstractActionInput *input) {
+        Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
+        action->parentAction()->addInput(input);
+    };
+    auto countFunction = [](QQmlListProperty<QAbstractActionInput> *list) -> qt_size_type {
+        Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
+        return action->parentAction()->inputs().count();
+    };
+    auto atFunction = [](QQmlListProperty<QAbstractActionInput> *list, qt_size_type index) -> QAbstractActionInput * {
+        Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
+        return action->parentAction()->inputs().at(index);
+    };
+    auto clearFunction = [](QQmlListProperty<QAbstractActionInput> *list) {
+        Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
+        const auto inputs = action->parentAction()->inputs();
+        for (QAbstractActionInput *input : inputs)
+            action->parentAction()->removeInput(input);
+    };
 
-void Quick3DAction::clearActionInputs(QQmlListProperty<QAbstractActionInput> *list)
-{
-    Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
-    const auto inputs = action->parentAction()->inputs();
-    for (QAbstractActionInput *input : inputs)
-        action->parentAction()->removeInput(input);
+    return QQmlListProperty<QAbstractActionInput>(this, nullptr, appendFunction, countFunction, atFunction, clearFunction);
 }