diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-02-02 14:47:07 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 00:39:18 +0100 |
| commit | 348b51327fe72fc8ea4292a3b5cb4df178c1d234 (patch) | |
| tree | f2d116b02509f183e10522f1c747b9d56d4324cc /src/declarative | |
| parent | 3499561431ea2ea15b2b70b5e9ea335e863d008e (diff) | |
Ensure || expressions in v4 will always exit.
Change-Id: I7188e38403fec96f83f3bdfc68b763a9aec9346a
Task-number: QTBUG-24038
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/v4/qv4irbuilder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/v4/qv4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp index 2cc1c6eaab..604eeaa713 100644 --- a/src/declarative/qml/v4/qv4irbuilder.cpp +++ b/src/declarative/qml/v4/qv4irbuilder.cpp @@ -892,6 +892,7 @@ bool QV4IRBuilder::visit(AST::BinaryExpression *ast) _block = iftrue; ExprResult right = expression(ast->right); _block->MOVE(r, right); + _block->JUMP(endif); if (left.type() != right.type()) discard(); |