diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-14 03:05:41 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-14 03:05:41 (GMT) |
| commit | f19b9cbdf824b8943acc785c50d13fade415bd33 (patch) | |
| tree | 1d5fe72fe4a50068287c3c1d29a1a17db6af88b7 /src/declarative/qml | |
| parent | b24a4c0b75f5d393ca673942b68a12f02ed476e8 (diff) | |
| parent | 2fe3de8526336cf59c23574fc48c61cd9ce2d9f6 (diff) | |
| download | Qt-f19b9cbdf824b8943acc785c50d13fade415bd33.zip Qt-f19b9cbdf824b8943acc785c50d13fade415bd33.tar.gz Qt-f19b9cbdf824b8943acc785c50d13fade415bd33.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeboundsignal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp index 762c6428..8c7a977 100644 --- a/src/declarative/qml/qdeclarativeboundsignal.cpp +++ b/src/declarative/qml/qdeclarativeboundsignal.cpp @@ -176,7 +176,7 @@ int QDeclarativeBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a) } if (m_params) m_params->setValues(a); - if (m_expression) { + if (m_expression && m_expression->engine()) { QDeclarativeExpressionPrivate::get(m_expression)->value(m_params); if (m_expression && m_expression->hasError()) qWarning().nospace() << qPrintable(m_expression->error().toString()); |