diff options
Diffstat (limited to 'src/qml/qml/qqmlproperty_p.h')
| -rw-r--r-- | src/qml/qml/qqmlproperty_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index 0f97a63155..f4a9ced53b 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -54,6 +54,7 @@ // #include "qqmlproperty.h" +#include "qqmlengine.h" #include <private/qobject_p.h> #include <private/qtqmlglobal_p.h> @@ -77,7 +78,7 @@ public: Q_DECLARE_FLAGS(WriteFlags, WriteFlag) QQmlContextData *context; - QQmlEngine *engine; + QQmlGuard<QQmlEngine> engine; QQmlGuard<QObject> object; QQmlPropertyData core; @@ -143,11 +144,6 @@ public: static QQmlExpression *setSignalExpression(const QQmlProperty &that, QQmlExpression *) ; static bool write(const QQmlProperty &that, const QVariant &, WriteFlags); - static bool writeBinding(const QQmlProperty &that, - QQmlContextData *context, - QQmlJavaScriptExpression *expression, - v8::Handle<v8::Value> result, bool isUndefined, - WriteFlags flags); static bool writeBinding(QObject *, const QQmlPropertyData &, QQmlContextData *context, QQmlJavaScriptExpression *expression, |