diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-16 00:13:24 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-16 00:13:24 (GMT) |
| commit | e4e566272f41a27b7b160c6e1344d24f66ad022c (patch) | |
| tree | 0a0ab20cb0dca377a4c6129882daee3719342e60 /src/declarative/qml/qmlobjectscriptclass.cpp | |
| parent | 338d6ca0d2d98c8c3ffc8c29b8135de8e0bb8a7b (diff) | |
| parent | 2eb67032ea81aa105a854644f337ad5377c2994e (diff) | |
| download | Qt-e4e566272f41a27b7b160c6e1344d24f66ad022c.zip Qt-e4e566272f41a27b7b160c6e1344d24f66ad022c.tar.gz Qt-e4e566272f41a27b7b160c6e1344d24f66ad022c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass.cpp')
| -rw-r--r-- | src/declarative/qml/qmlobjectscriptclass.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index 122db51..ae2cfcc 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -250,6 +250,7 @@ void QmlObjectScriptClass::setProperty(QObject *obj, Q_ASSERT(lastData); QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine); + Q_ASSERT(enginePriv->currentExpression); // ### Can well known types be optimized? QVariant v = QmlScriptClass::toVariant(engine, value); |