diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-19 00:31:04 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-19 07:57:45 +0100 |
commit | cac9989643d54b15ea0b8e53889336b429e4504d (patch) | |
tree | 35211bbb4829385c2c91d4296b2a9d4e5929030b /src/qml/qml/qqmlcompiler.cpp | |
parent | da31479ee237a40ed03bcaf1352f00d33d1f325c (diff) |
Fix failing assertion when trying to assign to an id referenced QML object
References to id addressed QML objects are member expressions, which are unlike
other member expressions by not being lvalues. Handle this correctly.
Task-Number: QTBUG-34890
Change-Id: Ied6230edbc561128ad36bf0d1a1918185204deec
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcompiler.cpp')
-rw-r--r-- | src/qml/qml/qqmlcompiler.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlcompiler.cpp b/src/qml/qml/qqmlcompiler.cpp index f9dd0b65a3..7b33849e67 100644 --- a/src/qml/qml/qqmlcompiler.cpp +++ b/src/qml/qml/qqmlcompiler.cpp @@ -3682,6 +3682,11 @@ bool QQmlCompiler::completeComponentBuild() jsCodeGen.beginObjectScope(scopeObject->metatype); cd->runtimeFunctionIndices = jsCodeGen.generateJSCodeForFunctionsAndBindings(cd->functionsToCompile, expressionNames); + QList<QQmlError> errors = jsCodeGen.errors(); + if (!errors.isEmpty()) { + exceptions << errors; + return false; + } foreach (const QQmlCompilerTypes::ComponentCompileState::CompiledMetaMethod &cmm, cd->compiledMetaMethods) { typedef QQmlVMEMetaData VMD; |