diff options
| author | Thomas McGuire <thomas.mcguire@kdab.com> | 2012-07-17 17:35:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-22 12:25:33 +0200 |
| commit | 26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9 (patch) | |
| tree | c058873b0082b18a09dde27f7ee124285e696807 /src/qml/qml/qqmljavascriptexpression_p.h | |
| parent | 2cc57f1e33cc4d739b1b76c605e6241fa0f134a8 (diff) | |
Make connectNotify() work with QML
Call connectNotify() and disconnectNotify() in QQmlNotifierEndPoint,
which works for QML signal handlers and for QML bindings.
Task-number: QTBUG-11284
Change-Id: Ic9a08ee6687e5c7e606f315c8fb30eec1493cd83
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index dc9b4b63c6..09da661186 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -141,6 +141,7 @@ public: inline bool hasDelayedError() const; QQmlError error(QQmlEngine *) const; void clearError(); + void clearGuards(); QQmlDelayedError *delayedError(); static void exceptionToError(v8::Handle<v8::Message>, QQmlError &); @@ -185,8 +186,6 @@ private: // activeGuards:flag2 - useSharedContext QBiPointer<QObject, DeleteWatcher> m_scopeObject; QForwardFieldList<Guard, &Guard::next> activeGuards; - - void clearGuards(); }; QQmlJavaScriptExpression::DeleteWatcher::DeleteWatcher(QQmlJavaScriptExpression *e) |