Fix a crash in the QIviSimulationEngine when using animations

The code handles now read and write of properties using the
staticMetaObject correctly.
Added more internal documentation for it and a autotest.

Change-Id: Iddceeebcf5317ddb3a6986d82febc81bd374b575
Fixes: AUTOSUITE-727
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

2 files changed, 17 insertions, 3 deletions

diff --git a/src/ivicore/qivisimulationproxy.cpp b/src/ivicore/qivisimulationproxy.cpp
index 8800f78..7f2ab00 100644
--- a/src/ivicore/qivisimulationproxy.cpp
+++ b/src/ivicore/qivisimulationproxy.cpp
@@ -82,6 +82,18 @@ int QIviSimulationProxyBase::qt_metacall(QMetaObject::Call call, int methodId, v
     if (m_noSimulationEngine)
         return -1;
 
+    // Special handling for the artificial "Base" property.
+    // All other properties are forwarded to the qt_metacall generated by moc which translates the
+    // absolute id's back to relative ones
+    if (call == QMetaObject::ReadProperty || call == QMetaObject::WriteProperty) {
+        int basePropertyIndex = m_staticMetaObject->indexOfProperty("Base");
+        if (methodId == basePropertyIndex) {
+            void *_v = a[0];
+            *reinterpret_cast< QObject**>(_v) = m_instance;
+            return -1;
+        }
+    }
+
     if (call == QMetaObject::InvokeMetaMethod) {
         // When a forwarded signal from the registered instance gets in. Directly call the signal here as well
         if (sender() == m_instance) {
@@ -89,6 +101,8 @@ int QIviSimulationProxyBase::qt_metacall(QMetaObject::Call call, int methodId, v
             QMetaObject::activate(this, m_staticMetaObject, methodId - m_staticMetaObject->methodOffset(), a);
             return 0;
         }
+        // As we don't derive from the MetaObject of m_instance, we need to use the methodMap to
+        // translate our methodId to the methodId for m_instance
         return m_instance->qt_metacall(call, m_methodMap.key(methodId), a);
     }
     return m_instance->qt_metacall(call, methodId, a);
diff --git a/src/ivicore/qivisimulationproxy.h b/src/ivicore/qivisimulationproxy.h
index f441b1c..8e23e9c 100644
--- a/src/ivicore/qivisimulationproxy.h
+++ b/src/ivicore/qivisimulationproxy.h
@@ -152,9 +152,9 @@ namespace qtivi_private {
                 return;
             Q_ASSERT_X(m_instance, "qt_static_metacall()", "QIviSimulationProxy::registerInstance needs to be called first");
             // As the class acts as a proxy, forward all calls here to the registered instance
-            if (call == QMetaObject::ReadProperty) {
-                void *_v = a[0];
-                *reinterpret_cast< T**>(_v) = m_instance;
+            // The methodIds start at 0 for the first property of this class. We need to add the
+            // offset to get the absolute property index for the normal qt_metacall
+            if (call == QMetaObject::ReadProperty || call == QMetaObject::WriteProperty) {
                 obj->qt_metacall(call, methodId + staticMetaObject.propertyOffset(), a);
                 return;
             }