diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-30 15:54:58 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-08 12:34:14 +0100 |
commit | 2828ee37e28c255298c6864620620fa378d74ac3 (patch) | |
tree | 4acb1e32f9942db9f37adbf352514842dc6eb7ac /src | |
parent | 5cb8ca29c3815405d41d035f5f4ebb2af326a8ef (diff) |
The property() calls in the proeprty cache only require a QJSEngine now
Change-Id: Ic4a944b4f1dd02ad2f0284acad5f3135068f66df
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 8 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 9355f31115..8a59cb7381 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -257,7 +257,7 @@ QQmlPropertyData *QObjectWrapper::findProperty(ExecutionEngine *engine, QQmlCont if (ddata && ddata->propertyCache) result = ddata->propertyCache->property(name, d()->object, qmlContext); else - result = QQmlPropertyCache::property(engine->v8Engine->engine(), d()->object, name, qmlContext, *local); + result = QQmlPropertyCache::property(engine->jsEngine(), d()->object, name, qmlContext, *local); return result; } @@ -428,7 +428,7 @@ bool QObjectWrapper::setQmlProperty(ExecutionEngine *engine, QQmlContextData *qm QQmlPropertyData local; QQmlPropertyData *result = 0; { - result = QQmlPropertyCache::property(engine->v8Engine->engine(), object, name, qmlContext, local); + result = QQmlPropertyCache::property(engine->jsEngine(), object, name, qmlContext, local); } if (!result) diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 182e6a7814..3afc8c09b8 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1269,7 +1269,7 @@ inline QString qQmlPropertyCacheToString(const QV4::String *string) template<typename T> QQmlPropertyData * -qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, T name, +qQmlPropertyCacheProperty(QJSEngine *engine, QObject *obj, T name, QQmlContextData *context, QQmlPropertyData &local) { QQmlPropertyCache *cache = 0; @@ -1279,7 +1279,7 @@ qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, T name, if (ddata && ddata->propertyCache) { cache = ddata->propertyCache; } else if (engine) { - QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine); + QJSEnginePrivate *ep = QJSEnginePrivate::get(engine); cache = ep->cache(obj); if (cache) { ddata = QQmlData::get(obj, true); @@ -1302,14 +1302,14 @@ qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, T name, } QQmlPropertyData * -QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, const QV4::String *name, +QQmlPropertyCache::property(QJSEngine *engine, QObject *obj, const QV4::String *name, QQmlContextData *context, QQmlPropertyData &local) { return qQmlPropertyCacheProperty<const QV4::String *>(engine, obj, name, context, local); } QQmlPropertyData * -QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, +QQmlPropertyCache::property(QJSEngine *engine, QObject *obj, const QString &name, QQmlContextData *context, QQmlPropertyData &local) { return qQmlPropertyCacheProperty<const QString &>(engine, obj, name, context, local); diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 033ff1de31..2b8a129803 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -303,9 +303,9 @@ public: inline QQmlPropertyData *overrideData(QQmlPropertyData *) const; inline bool isAllowedInRevision(QQmlPropertyData *) const; - static QQmlPropertyData *property(QQmlEngine *, QObject *, const QString &, + static QQmlPropertyData *property(QJSEngine *, QObject *, const QString &, QQmlContextData *, QQmlPropertyData &); - static QQmlPropertyData *property(QQmlEngine *, QObject *, const QV4::String *, + static QQmlPropertyData *property(QJSEngine *, QObject *, const QV4::String *, QQmlContextData *, QQmlPropertyData &); //see QMetaObjectPrivate::originalClone |