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/qml/qml/qqmlpropertycache_p.h | |
| 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/qml/qml/qqmlpropertycache_p.h')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |