aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-02-15 10:27:44 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-16 08:31:10 +0100
commit64a5087df7896524bf6af30067f442d1fc8458bc (patch)
tree5492a8c315062110be7c445c9fe5cfe8812fa7c9 /src
parent2df9abf7047afbe20b19d156ac37b58d9b047575 (diff)
Set the type for unary expressions in v4.
Previously unary expressions were being discarded because the type was not set. Also add tests verifying the results. Change-Id: Icbb493fbb6f036e59c8a4a1fe232c118312a63a5 Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/v4/qv4ir_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/v4/qv4ir_p.h b/src/declarative/qml/v4/qv4ir_p.h
index 2ed403fc29..746995e5be 100644
--- a/src/declarative/qml/v4/qv4ir_p.h
+++ b/src/declarative/qml/v4/qv4ir_p.h
@@ -306,7 +306,7 @@ struct Unop: Expr {
void init(AluOp op, Expr *expr)
{
- this->typeForOp(op, expr);
+ this->type = this->typeForOp(op, expr);
this->op = op;
this->expr = expr;
}