diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-23 01:52:06 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-23 01:52:06 (GMT) |
| commit | 92e7f06b3690e6e39af8fac7af6c101b416b0f4c (patch) | |
| tree | e8ad882eb106b083cfe70b015f8aeaef15f04ca3 /src/declarative/qml/qdeclarativeboundsignal_p.h | |
| parent | af3c75a63e9b7dd9725443a8e23114f825c6d12b (diff) | |
| download | Qt-92e7f06b3690e6e39af8fac7af6c101b416b0f4c.zip Qt-92e7f06b3690e6e39af8fac7af6c101b416b0f4c.tar.gz Qt-92e7f06b3690e6e39af8fac7af6c101b416b0f4c.tar.bz2 | |
Don't crash if Connections::target is changed by one of its signal handlers
Reviewed-by: Michael Brasser
Diffstat (limited to 'src/declarative/qml/qdeclarativeboundsignal_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeboundsignal_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeboundsignal_p.h b/src/declarative/qml/qdeclarativeboundsignal_p.h index bba4eec..06900d7 100644 --- a/src/declarative/qml/qdeclarativeboundsignal_p.h +++ b/src/declarative/qml/qdeclarativeboundsignal_p.h @@ -83,6 +83,8 @@ public: QDeclarativeExpression *expression() const; QDeclarativeExpression *setExpression(QDeclarativeExpression *); + bool isEvaluating() const { return m_isEvaluating; } + static QDeclarativeBoundSignal *cast(QObject *); protected: @@ -91,7 +93,8 @@ protected: private: QDeclarativeExpression *m_expression; QMetaMethod m_signal; - bool m_paramsValid; + bool m_paramsValid : 1; + bool m_isEvaluating : 1; QDeclarativeBoundSignalParameters *m_params; }; |