aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlpropertycache.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2014-12-30 15:54:58 +0100
committerLars Knoll <lars.knoll@digia.com>2015-01-08 12:34:14 +0100
commit2828ee37e28c255298c6864620620fa378d74ac3 (patch)
tree4acb1e32f9942db9f37adbf352514842dc6eb7ac /src/qml/qml/qqmlpropertycache.cpp
parent5cb8ca29c3815405d41d035f5f4ebb2af326a8ef (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/qml/qml/qqmlpropertycache.cpp')
-rw-r--r--src/qml/qml/qqmlpropertycache.cpp8
1 files changed, 4 insertions, 4 deletions
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);