Fix v4 nested object access bug.

Use the correct type to look up the sub property.

Task-number: QTBUG-24606
Change-Id: Iab372ca7440249241bf855d2875a947ad8fe4527
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

diff --git a/src/qml/qml/v4/qv4irbuilder.cpp b/src/qml/qml/v4/qv4irbuilder.cpp
index 36e88e5..06f4024 100644 (file)
--- a/src/qml/qml/v4/qv4irbuilder.cpp
+++ b/src/qml/qml/v4/qv4irbuilder.cpp
@@ -628,7 +628,8 @@ bool QV4IRBuilder::visit(AST::FieldMemberExpression *ast)
 
             case IR::Name::Property: 
                 if (baseName->type == IR::ObjectType && baseName->meta && baseName->property->isFinal()) {
-                    QQmlPropertyCache *cache = m_engine->cache(baseName->meta);
+                    const QMetaObject *meta = m_engine->metaObjectForType(baseName->property->propType);
+                    QQmlPropertyCache *cache = m_engine->cache(meta);
                     if (!cache)
                         return false;
 
@@ -640,9 +641,9 @@ bool QV4IRBuilder::visit(AST::FieldMemberExpression *ast)
                             return false; // We don't know enough about this property
                         }
 
-                        IR::Type irType = irTypeFromVariantType(data->propType, m_engine, baseName->meta);
+                        IR::Type irType = irTypeFromVariantType(data->propType, m_engine, meta);
                         _expr.code = _block->SYMBOL(baseName, irType, name,
-                                                    baseName->meta, data, line, column);
+                                                    meta, data, line, column);
                     }
                 }
                 break;

diff --git a/tests/auto/qml/v4/tst_v4.cpp b/tests/auto/qml/v4/tst_v4.cpp
index f8422ac..91a3226 100644 (file)
--- a/tests/auto/qml/v4/tst_v4.cpp
+++ b/tests/auto/qml/v4/tst_v4.cpp
@@ -252,7 +252,6 @@ void tst_v4::nestedObjectAccess()
         ResultObject *ro = qobject_cast<ResultObject *>(o);
         QVERIFY(ro != 0);
 
-        QEXPECT_FAIL("","QTBUG-24606", Continue);
         QCOMPARE(ro->result(), 37);
 
         delete o;