diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-18 14:01:52 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-18 16:45:41 +0200 |
commit | 9185f1e207c8dac3f05b13f40cf79f8d3ee34ed5 (patch) | |
tree | e309c59d225734389d30fb0c25ac9c4fe7943329 /tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml | |
parent | 82ca7d96e95dfc505ee1a50623f913c0d2bddf30 (diff) |
Fix tst_qqmlecmascript::functionAssignment_fromJS
Make the test-case compile with strict mode, where function declarations
are not allowed within blocks. An alternative would be to use function
expressions here.
Change-Id: If7e1cc23ef4a0c6a83e4ba8ae03dc9c6b678730d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml')
-rw-r--r-- | tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml b/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml index 3d8fd85a88..943d34ca84 100644 --- a/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml @@ -19,11 +19,11 @@ MyQmlObject { property bool assignWrongType: false property bool assignWrongTypeToValueType: false + function myFunction() { + return aNumber * 10; + } onAssignToPropertyChanged: { - function myFunction() { - return aNumber * 10; - } a = Qt.binding(myFunction); } @@ -54,17 +54,17 @@ MyQmlObject { // detecting errors: + function myEmptyFunction() { + } onAssignFuncWithoutReturnChanged: { - function myFunction() { - } - a = Qt.binding(myFunction); + a = Qt.binding(myEmptyFunction); } + function myStringFunction() { + return 'a string'; + } onAssignWrongTypeChanged: { - function myFunction() { - return 'a string'; - } - aNumber = Qt.binding(myFunction); + aNumber = Qt.binding(myStringFunction); } onAssignWrongTypeToValueTypeChanged: { |