aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v4/qv4ir.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml/v4/qv4ir.cpp')
-rw-r--r--src/qml/qml/v4/qv4ir.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4ir.cpp b/src/qml/qml/v4/qv4ir.cpp
index 982742c781..8fc4719791 100644
--- a/src/qml/qml/v4/qv4ir.cpp
+++ b/src/qml/qml/v4/qv4ir.cpp
@@ -606,6 +606,12 @@ Expr *BasicBlock::BINOP(AluOp op, Expr *left, Expr *right)
break;
}
}
+ } else if (op == OpAdd) {
+ if (String *s1 = left->asString()) {
+ if (String *s2 = right->asString()) {
+ return STRING(function->newString(s1->value.toString() + s2->value));
+ }
+ }
}
}