diff options
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 6 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index c2b3b44bba..b8d0c887fe 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -202,7 +202,7 @@ static QV4::ReturnedValue LoadProperty(QV8Engine *engine, QObject *object, if (QQmlValueTypeFactory::isValueType(v.userType())) { if (const QMetaObject *valueTypeMetaObject = QQmlValueTypeFactory::metaObjectForMetaType(v.userType())) - return QV4::QmlValueTypeWrapper::create(engine, object, property.coreIndex, valueTypeMetaObject, v.userType()); // VariantReference value-type. + return QV4::QQmlValueTypeWrapper::create(engine, object, property.coreIndex, valueTypeMetaObject, v.userType()); // VariantReference value-type. } return engine->fromVariant(v); @@ -210,7 +210,7 @@ static QV4::ReturnedValue LoadProperty(QV8Engine *engine, QObject *object, Q_ASSERT(notifier == 0); if (const QMetaObject *valueTypeMetaObject = QQmlValueTypeFactory::metaObjectForMetaType(property.propType)) - return QV4::QmlValueTypeWrapper::create(engine, object, property.coreIndex, valueTypeMetaObject, property.propType); + return QV4::QQmlValueTypeWrapper::create(engine, object, property.coreIndex, valueTypeMetaObject, property.propType); } else { Q_ASSERT(notifier == 0); @@ -1288,7 +1288,7 @@ static int MatchScore(const QV4::ValueRef actual, int conversionType) } } - if (obj->as<QV4::QmlValueTypeWrapper>()) { + if (obj->as<QV4::QQmlValueTypeWrapper>()) { if (engine->toVariant(actual, -1).userType() == conversionType) return 0; return 10; diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index d08d2a0812..efd0452a18 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -87,7 +87,7 @@ bool VariantObject::isEqualTo(Managed *m, Managed *other) if (QV4::VariantObject *rv = other->as<QV4::VariantObject>()) return lv->d()->data == rv->d()->data; - if (QV4::QmlValueTypeWrapper *v = other->as<QmlValueTypeWrapper>()) + if (QV4::QQmlValueTypeWrapper *v = other->as<QQmlValueTypeWrapper>()) return v->isEqual(lv->d()->data); return false; |