qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QmlCompiler: When rejecting empty constants, don't crash afterwards 

Fixes: QTBUG-119091
Change-Id: I1e24583aa998976c96bf3ddd6865f33cc4d5e94c
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 8190f5bd68)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6049b22c97)
This commit is contained in:
Ulf Hermann 2023-11-17 09:35:35 +01:00 committed by Qt Cherry-pick Bot
parent 98ab3cef46
commit e8470c0b3a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qmlcompiler/qqmljscodegenerator.cpp
View File

@ -448,6 +448,7 @@ void QQmlJSCodeGenerator::generate_MoveConst(int constIndex, int destTemp)
input = toNumericString(v4Value.doubleValue()); input = toNumericString(v4Value.doubleValue());
} else { } else {
reject(u"unknown const type"_s); reject(u"unknown const type"_s);
return;
} }
m_body += conversion(contained, changed, input) + u";\n"_s; m_body += conversion(contained, changed, input) + u";\n"_s;
generateOutputVariantConversion(contained); generateOutputVariantConversion(contained);

2
tests/auto/qml/qmlcppcodegen/data/failures.qml
View File

@ -81,4 +81,6 @@ QtObject {
readonly property int someNumber: 10 readonly property int someNumber: 10
function writeToReadonly() { someNumber = 20 } function writeToReadonly() { someNumber = 20 }
property var silly: [,0]
} }