diff options
author | Tony Sarajärvi <[email protected]> | 2014-04-24 10:38:56 +0200 |
---|---|---|
committer | The Qt Project <[email protected]> | 2014-04-24 10:38:56 +0200 |
commit | d71fb383337b45c31653e54345bff58cf419af19 (patch) | |
tree | cedb42b21569992a17f715394b0efe88a3d29128 /src/qml/jsruntime | |
parent | 6c733c2c2ffd3fb1fb5c43af9cce59b9a7b8a510 (diff) | |
parent | 7d16c2f40a2995c6bdff3a1999a7cb6100fdf301 (diff) |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index de556dc9ed..b61be913a6 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -685,7 +685,7 @@ void QObjectWrapper::put(Managed *m, const StringRef name, const ValueRef value) QQmlData *ddata = QQmlData::get(that->m_object); // Types created by QML are not extensible at run-time, but for other QObjects we can store them // as regular JavaScript properties, like on JavaScript objects. - if (ddata && ddata->compiledData) { + if (ddata && ddata->context) { QString error = QLatin1String("Cannot assign to non-existent property \"") + name->toQString() + QLatin1Char('\"'); v4->currentContext()->throwError(error); |