diff options
Diffstat (limited to 'tests/auto/qml/qqmlecmascript')
44 files changed, 106 insertions, 106 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/aliasBindingsAssignCorrectly.qml b/tests/auto/qml/qqmlecmascript/data/aliasBindingsAssignCorrectly.qml index ff6c553c31..113b9f111b 100644 --- a/tests/auto/qml/qqmlecmascript/data/aliasBindingsAssignCorrectly.qml +++ b/tests/auto/qml/qqmlecmascript/data/aliasBindingsAssignCorrectly.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 Item { id: root - + property bool test: false property real testData: 9 diff --git a/tests/auto/qml/qqmlecmascript/data/aliasBindingsOverrideTarget.3.qml b/tests/auto/qml/qqmlecmascript/data/aliasBindingsOverrideTarget.3.qml index 3e4cda6ba3..c68dfcd60d 100644 --- a/tests/auto/qml/qqmlecmascript/data/aliasBindingsOverrideTarget.3.qml +++ b/tests/auto/qml/qqmlecmascript/data/aliasBindingsOverrideTarget.3.qml @@ -11,7 +11,7 @@ Item { id: obj testProperty: root.value1 * 9 - aliasProperty: root.value2 * 10 + aliasProperty: root.value2 * 10 } Component.onCompleted: { diff --git a/tests/auto/qml/qqmlecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/qml/qqmlecmascript/data/aliasPropertyAndBinding.qml index f228b2c19f..7c871875b2 100644 --- a/tests/auto/qml/qqmlecmascript/data/aliasPropertyAndBinding.qml +++ b/tests/auto/qml/qqmlecmascript/data/aliasPropertyAndBinding.qml @@ -4,9 +4,9 @@ import Qt.test 1.0 MyQmlObject { property alias c1: myObject.c1 property int c2: 3 - property int c3: c2 - objectProperty: QtObject { - id: myObject + property int c3: c2 + objectProperty: QtObject { + id: myObject property int c1 } } diff --git a/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.2.qml b/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.2.qml index ff6d7311a1..821e1b2356 100644 --- a/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.2.qml @@ -12,7 +12,7 @@ MyTypeObject { floatProperty: if(1) 8.5 colorProperty: if(1) "red" dateProperty: if(1) "1982-11-25" - timeProperty: if(1) "11:11:32" + timeProperty: if(1) "11:11:32" dateTimeProperty: if(1) "2009-05-12T13:22:01" pointProperty: if(1) "99,13" pointFProperty: if(1) "-10.1,12.3" diff --git a/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.qml b/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.qml index ce3511f72a..b7c1e1cc39 100644 --- a/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.qml +++ b/tests/auto/qml/qqmlecmascript/data/assignBasicTypes.qml @@ -14,7 +14,7 @@ MyTypeObject { floatProperty = 8.5 colorProperty = "red" dateProperty = "1982-11-25" - timeProperty = "11:11:32" + timeProperty = "11:11:32" dateTimeProperty = "2009-05-12T13:22:01" pointProperty = "99,13" pointFProperty = "-10.1,12.3" diff --git a/tests/auto/qml/qqmlecmascript/data/bindingLoop.qml b/tests/auto/qml/qqmlecmascript/data/bindingLoop.qml index 80545cf72b..e49a26d909 100644 --- a/tests/auto/qml/qqmlecmascript/data/bindingLoop.qml +++ b/tests/auto/qml/qqmlecmascript/data/bindingLoop.qml @@ -1,14 +1,14 @@ import Qt.test 1.0 -MyQmlContainer { - children : [ - MyQmlObject { - id: object1 - stringProperty: "hello" + object2.stringProperty +MyQmlContainer { + children : [ + MyQmlObject { + id: object1 + stringProperty: "hello" + object2.stringProperty }, - MyQmlObject { - id: object2 - stringProperty: "hello" + object1.stringProperty - } - ] + MyQmlObject { + id: object2 + stringProperty: "hello" + object1.stringProperty + } + ] } diff --git a/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml b/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml index 3147f63989..054ecb98f6 100644 --- a/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml +++ b/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml @@ -1,5 +1,5 @@ import Qt.test 1.0 -MyQmlObject { - stringProperty: trueProperty?'pass':'fail' +MyQmlObject { + stringProperty: trueProperty?'pass':'fail' } diff --git a/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml b/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml index c89bb49b45..37c747b3a0 100644 --- a/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml @@ -1,5 +1,5 @@ import Qt.test 1.0 -MyQmlObject { - stringProperty: falseProperty?'fail':'pass' +MyQmlObject { + stringProperty: falseProperty?'fail':'pass' } diff --git a/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.2.qml index 207a06b700..7a0b0d6e3c 100644 --- a/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.2.qml @@ -4,8 +4,8 @@ MyQmlObject { property alias c1: myConstants.c1 property alias c2: myConstants.c2 - objectProperty: ConstantsOverrideBindings { + objectProperty: ConstantsOverrideBindings { id: myConstants - c2: 10 + c2: 10 } } diff --git a/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.4.qml b/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.4.qml index 5a2091f71c..0c900d78a4 100644 --- a/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.4.qml +++ b/tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.4.qml @@ -4,7 +4,7 @@ MyQmlObject { property alias c1: myConstants.c1 property alias c3: myConstants.c3 - objectProperty: ConstantsOverrideBindings { + objectProperty: ConstantsOverrideBindings { id: myConstants c3: 10 } diff --git a/tests/auto/qml/qqmlecmascript/data/deletedEngine.qml b/tests/auto/qml/qqmlecmascript/data/deletedEngine.qml index 97acddf5fc..b3adaac20e 100644 --- a/tests/auto/qml/qqmlecmascript/data/deletedEngine.qml +++ b/tests/auto/qml/qqmlecmascript/data/deletedEngine.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 QtObject { function calculate() { - return b * 13; + return b * 13; } property int a: calculate() diff --git a/tests/auto/qml/qqmlecmascript/data/dynamicDeletion.2.qml b/tests/auto/qml/qqmlecmascript/data/dynamicDeletion.2.qml index 9a5732c194..af995150f1 100644 --- a/tests/auto/qml/qqmlecmascript/data/dynamicDeletion.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/dynamicDeletion.2.qml @@ -14,7 +14,7 @@ QtObject { function create() { objectProperty = c.createObject(root); } - + function destroy() { objectProperty.destroy(); } diff --git a/tests/auto/qml/qqmlecmascript/data/eval.qml b/tests/auto/qml/qqmlecmascript/data/eval.qml index a752b8c0d3..87e52d383a 100644 --- a/tests/auto/qml/qqmlecmascript/data/eval.qml +++ b/tests/auto/qml/qqmlecmascript/data/eval.qml @@ -1,11 +1,11 @@ import QtQuick 2.0 QtObject { - property bool test1: false; - property bool test2: false; - property bool test3: false; - property bool test4: false; - property bool test5: false; + property bool test1: false; + property bool test2: false; + property bool test3: false; + property bool test4: false; + property bool test5: false; property int a: 7 diff --git a/tests/auto/qml/qqmlecmascript/data/include.qml b/tests/auto/qml/qqmlecmascript/data/include.qml index 5ce2ed78ec..7a8c69d3f7 100644 --- a/tests/auto/qml/qqmlecmascript/data/include.qml +++ b/tests/auto/qml/qqmlecmascript/data/include.qml @@ -11,8 +11,8 @@ QtObject { property int testValue: 99 - Component.onCompleted: { - IncludeTest.go(); + Component.onCompleted: { + IncludeTest.go(); test0 = IncludeTest.value test1 = IncludeTest.test1 test2 = IncludeTest.test2 diff --git a/tests/auto/qml/qqmlecmascript/data/include_callback.qml b/tests/auto/qml/qqmlecmascript/data/include_callback.qml index fbebcdcd58..2f8ae28696 100644 --- a/tests/auto/qml/qqmlecmascript/data/include_callback.qml +++ b/tests/auto/qml/qqmlecmascript/data/include_callback.qml @@ -9,7 +9,7 @@ QtObject { property bool test5: false property bool test6: false - Component.onCompleted: { - IncludeTest.go(); + Component.onCompleted: { + IncludeTest.go(); } } diff --git a/tests/auto/qml/qqmlecmascript/data/include_remote.js b/tests/auto/qml/qqmlecmascript/data/include_remote.js index e6a4676819..4331cb79d0 100644 --- a/tests/auto/qml/qqmlecmascript/data/include_remote.js +++ b/tests/auto/qml/qqmlecmascript/data/include_remote.js @@ -2,8 +2,8 @@ var myvar = 10; function go() { - var a = Qt.include("http://127.0.0.1:8111/remote_file.js", - function(o) { + var a = Qt.include("http://127.0.0.1:8111/remote_file.js", + function(o) { test2 = o.status == o.OK test3 = a.status == a.OK test4 = myvar == 13 @@ -13,8 +13,8 @@ function go() test1 = a.status == a.LOADING - var b = Qt.include("http://127.0.0.1:8111/exception.js", - function(o) { + var b = Qt.include("http://127.0.0.1:8111/exception.js", + function(o) { test7 = o.status == o.EXCEPTION test8 = b.status == a.EXCEPTION test9 = b.exception.toString() == "Whoops!"; diff --git a/tests/auto/qml/qqmlecmascript/data/include_remote_missing.js b/tests/auto/qml/qqmlecmascript/data/include_remote_missing.js index cc90860cc9..27dd63badf 100644 --- a/tests/auto/qml/qqmlecmascript/data/include_remote_missing.js +++ b/tests/auto/qml/qqmlecmascript/data/include_remote_missing.js @@ -1,7 +1,7 @@ function go() { - var a = Qt.include("http://127.0.0.1:8111/missing.js", - function(o) { + var a = Qt.include("http://127.0.0.1:8111/missing.js", + function(o) { test2 = o.status == o.NETWORK_ERROR test3 = a.status == a.NETWORK_ERROR diff --git a/tests/auto/qml/qqmlecmascript/data/include_shared.qml b/tests/auto/qml/qqmlecmascript/data/include_shared.qml index 28b1003fd4..66c07e871b 100644 --- a/tests/auto/qml/qqmlecmascript/data/include_shared.qml +++ b/tests/auto/qml/qqmlecmascript/data/include_shared.qml @@ -9,8 +9,8 @@ QtObject { property bool test3: false property bool test3_1: false - Component.onCompleted: { - IncludeTest.go(); + Component.onCompleted: { + IncludeTest.go(); test0 = IncludeTest.value test1 = IncludeTest.test1 test2 = IncludeTest.test2 diff --git a/tests/auto/qml/qqmlecmascript/data/methods.1.qml b/tests/auto/qml/qqmlecmascript/data/methods.1.qml index 0bbee16df8..5c5b3412a5 100644 --- a/tests/auto/qml/qqmlecmascript/data/methods.1.qml +++ b/tests/auto/qml/qqmlecmascript/data/methods.1.qml @@ -1,6 +1,6 @@ import Qt.test 1.0 -MyQmlObject { +MyQmlObject { id: myObject - onBasicSignal: myObject.methodNoArgs() + onBasicSignal: myObject.methodNoArgs() } diff --git a/tests/auto/qml/qqmlecmascript/data/methods.2.qml b/tests/auto/qml/qqmlecmascript/data/methods.2.qml index 9f0c6b15fe..b2adaf65cb 100644 --- a/tests/auto/qml/qqmlecmascript/data/methods.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/methods.2.qml @@ -1,6 +1,6 @@ import Qt.test 1.0 -MyQmlObject { +MyQmlObject { id: myObject - onBasicSignal: myObject.method(163) + onBasicSignal: myObject.method(163) } diff --git a/tests/auto/qml/qqmlecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/qml/qqmlecmascript/data/outerBindingOverridesInnerBinding.qml index 090c948f26..a57b09fe6a 100644 --- a/tests/auto/qml/qqmlecmascript/data/outerBindingOverridesInnerBinding.qml +++ b/tests/auto/qml/qqmlecmascript/data/outerBindingOverridesInnerBinding.qml @@ -6,8 +6,8 @@ MyQmlObject { property alias c2: myConstants.c2 property int c3: 0 - objectProperty: ConstantsOverrideBindings { - id: myConstants + objectProperty: ConstantsOverrideBindings { + id: myConstants c2: obj.c3 } diff --git a/tests/auto/qml/qqmlecmascript/data/propertySplicing.qml b/tests/auto/qml/qqmlecmascript/data/propertySplicing.qml index 53711db3f4..d079d5ce99 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertySplicing.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertySplicing.qml @@ -3,7 +3,7 @@ import QtQuick 2.0 MyDerivedObject { property bool test: false - + Component.onCompleted: { test = intProperty() } diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVar.2.qml b/tests/auto/qml/qqmlecmascript/data/propertyVar.2.qml index 2ac4807ec5..4a715b7a4f 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVar.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVar.2.qml @@ -15,7 +15,7 @@ Item { if (wheelCount != 8) return; // not bindable, but wheelCount will update because truck itself changed. - truck = new vehicle(12); + truck = new vehicle(12); if (wheelCount != 12) return; diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.2.qml b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.2.qml index 14d4f9fd27..4693202240 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.2.qml @@ -18,7 +18,7 @@ Item { if (varProperty.a != 10) return; test = true; - } + } } diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.3.qml b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.3.qml index d5b449c938..5b0236505f 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.3.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.3.qml @@ -16,7 +16,7 @@ Item { test1 = true; } - // Run gc() from C++ + // Run gc() from C++ function runTest2() { if (object.dummy != 10) return; diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.qml b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.qml index 7b99c4b6ad..935485bb81 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.qml @@ -17,6 +17,6 @@ Item { if (varProperty.a != 10) return; test = true; - } + } } diff --git a/tests/auto/qml/qqmlecmascript/data/scope.2.qml b/tests/auto/qml/qqmlecmascript/data/scope.2.qml index fe1c4c7931..3a2d653e2c 100644 --- a/tests/auto/qml/qqmlecmascript/data/scope.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/scope.2.qml @@ -27,7 +27,7 @@ Item { // id takes precedence over local, and root properties - property int test1: a.value + property int test1: a.value property alias test2: nested.test // properties takes precedence over local, and root methods diff --git a/tests/auto/qml/qqmlecmascript/data/scriptConnect.1.qml b/tests/auto/qml/qqmlecmascript/data/scriptConnect.1.qml index ace473756e..2e15f4327b 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptConnect.1.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptConnect.1.qml @@ -1,10 +1,10 @@ import Qt.test 1.0 import QtQuick 2.0 import "scriptConnect.1.js" as Script -MyQmlObject { +MyQmlObject { property bool test: false id: root - + Component.onCompleted: root.argumentSignal.connect(Script.testFunction); } diff --git a/tests/auto/qml/qqmlecmascript/data/scriptConnect.2.qml b/tests/auto/qml/qqmlecmascript/data/scriptConnect.2.qml index cdf2d6ad98..9f91c5d1f7 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptConnect.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptConnect.2.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 2.0 import "scriptConnect.2.js" as Script -MyQmlObject { +MyQmlObject { property bool test: false id: root - + Component.onCompleted: { var a = new Object; a.b = 12; diff --git a/tests/auto/qml/qqmlecmascript/data/scriptConnect.3.qml b/tests/auto/qml/qqmlecmascript/data/scriptConnect.3.qml index b0e40565c0..e41b1c1f23 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptConnect.3.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptConnect.3.qml @@ -1,11 +1,11 @@ import Qt.test 1.0 import QtQuick 2.0 -MyQmlObject { +MyQmlObject { property bool test: false id: root - + function testFunction() { test = true; } diff --git a/tests/auto/qml/qqmlecmascript/data/scriptConnect.4.qml b/tests/auto/qml/qqmlecmascript/data/scriptConnect.4.qml index ef5331c94a..05155bf11d 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptConnect.4.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptConnect.4.qml @@ -1,7 +1,7 @@ import Qt.test 1.0 import QtQuick 2.0 -MyQmlObject { +MyQmlObject { property bool test: false id: root diff --git a/tests/auto/qml/qqmlecmascript/data/scriptConnect.5.qml b/tests/auto/qml/qqmlecmascript/data/scriptConnect.5.qml index 8dcacbcbb7..16b085e109 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptConnect.5.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptConnect.5.qml @@ -1,7 +1,7 @@ import Qt.test 1.0 import QtQuick 2.0 -MyQmlObject { +MyQmlObject { property bool test: false id: root diff --git a/tests/auto/qml/qqmlecmascript/data/scriptConnect.6.qml b/tests/auto/qml/qqmlecmascript/data/scriptConnect.6.qml index 06b6f0fa62..0a3510fb9d 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptConnect.6.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptConnect.6.qml @@ -2,12 +2,12 @@ import Qt.test 1.0 import QtQuick 2.0 import "scriptConnect.6.js" as Script -MyQmlObject { +MyQmlObject { property int test: 0 id: root - Component.onCompleted: { + Component.onCompleted: { root.argumentSignal.connect(Script.testFunction); root.argumentSignal.connect(Script.testFunction); } diff --git a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.1.qml b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.1.qml index e546ee44d8..7057437c33 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.1.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.1.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 2.0 import "scriptDisconnect.1.js" as Script -MyQmlObject { +MyQmlObject { property int test: 0 id: root - + Component.onCompleted: root.argumentSignal.connect(Script.testFunction); onBasicSignal: root.argumentSignal.disconnect(Script.testFunction); diff --git a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.2.qml b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.2.qml index e70cd8b900..70a9243835 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.2.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 2.0 import "scriptDisconnect.1.js" as Script -MyQmlObject { +MyQmlObject { property int test: 0 id: root - + Component.onCompleted: root.argumentSignal.connect(root, Script.testFunction); onBasicSignal: root.argumentSignal.disconnect(root, Script.testFunction); diff --git a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.3.qml b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.3.qml index 6f47776ea5..bb9abbd2c4 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.3.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.3.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 2.0 import "scriptDisconnect.1.js" as Script -MyQmlObject { +MyQmlObject { property int test: 0 id: root - + Component.onCompleted: root.argumentSignal.connect(root, Script.testFunction); onBasicSignal: root.argumentSignal.disconnect(Script.testFunction); diff --git a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.4.qml b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.4.qml index b3887545fb..d289d17eeb 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.4.qml +++ b/tests/auto/qml/qqmlecmascript/data/scriptDisconnect.4.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 2.0 import "scriptDisconnect.1.js" as Script -MyQmlObject { +MyQmlObject { property int test: 0 id: root - + Component.onCompleted: root.argumentSignal.connect(Script.testFunction); onBasicSignal: root.argumentSignal.disconnect(Script.otherFunction); diff --git a/tests/auto/qml/qqmlecmascript/data/scriptErrors.js b/tests/auto/qml/qqmlecmascript/data/scriptErrors.js index d22f623edb..4f16ef4e82 100644 --- a/tests/auto/qml/qqmlecmascript/data/scriptErrors.js +++ b/tests/auto/qml/qqmlecmascript/data/scriptErrors.js @@ -1,4 +1,4 @@ // Comment a = 10 -function getValue() { a = 10; return 0; } +function getValue() { a = 10; return 0; } diff --git a/tests/auto/qml/qqmlecmascript/data/selfDeletingBinding.2.qml b/tests/auto/qml/qqmlecmascript/data/selfDeletingBinding.2.qml index 58cf8051f0..d1bddb435c 100644 --- a/tests/auto/qml/qqmlecmascript/data/selfDeletingBinding.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/selfDeletingBinding.2.qml @@ -11,7 +11,7 @@ MyQmlContainer { MyQmlObject { // Will trigger deletion on binding assignment, but after component creation - deleteOnSet: if (triggerDelete) 1; else 0; + deleteOnSet: if (triggerDelete) 1; else 0; } ] } diff --git a/tests/auto/qml/qqmlecmascript/data/signalAssignment.1.qml b/tests/auto/qml/qqmlecmascript/data/signalAssignment.1.qml index fbd09142f7..fbafd843da 100644 --- a/tests/auto/qml/qqmlecmascript/data/signalAssignment.1.qml +++ b/tests/auto/qml/qqmlecmascript/data/signalAssignment.1.qml @@ -1,5 +1,5 @@ import Qt.test 1.0 -MyQmlObject { - onBasicSignal: setString('pass') +MyQmlObject { + onBasicSignal: setString('pass') } diff --git a/tests/auto/qml/qqmlecmascript/data/signalAssignment.2.qml b/tests/auto/qml/qqmlecmascript/data/signalAssignment.2.qml index 6467c42bb9..8406566848 100644 --- a/tests/auto/qml/qqmlecmascript/data/signalAssignment.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/signalAssignment.2.qml @@ -1,5 +1,5 @@ import Qt.test 1.0 -MyQmlObject { +MyQmlObject { onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c + ' ' + d + ' ' + e) } diff --git a/tests/auto/qml/qqmlecmascript/data/signalTriggeredBindings.qml b/tests/auto/qml/qqmlecmascript/data/signalTriggeredBindings.qml index d98d7e9c81..1def3d0307 100644 --- a/tests/auto/qml/qqmlecmascript/data/signalTriggeredBindings.qml +++ b/tests/auto/qml/qqmlecmascript/data/signalTriggeredBindings.qml @@ -11,7 +11,7 @@ MyQmlObject { property real test1: base property real test2: Math.max(0, base) } - + // Signal with no args onBasicSignal: base = 200 // Signal with args diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index 2aef1d644d..928d594f62 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -152,7 +152,7 @@ public: } QObject *objectProperty() const { return m_object; } - void setObjectProperty(QObject *obj) { + void setObjectProperty(QObject *obj) { if (obj == m_object) return; m_object = obj; @@ -206,7 +206,7 @@ public: int intProperty() const { return m_intProperty; } void setIntProperty(int i) { m_intProperty = i; emit intChanged(); } - + Q_INVOKABLE MyEnum2 getEnumValue() const { return EnumValue4; } MyEnum enumPropertyValue; @@ -803,7 +803,7 @@ public: Q_INVOKABLE void method_QObject(QObject *a) { invoke(13); m_actuals << qVariantFromValue(a); } Q_INVOKABLE void method_QScriptValue(QJSValue a) { invoke(14); m_actuals << qVariantFromValue(a); } Q_INVOKABLE void method_intQScriptValue(int a, QJSValue b) { invoke(15); m_actuals << a << qVariantFromValue(b); } - + Q_INVOKABLE void method_overload(int a) { invoke(16); m_actuals << a; } Q_INVOKABLE void method_overload(int a, int b) { invoke(17); m_actuals << a << b; } Q_INVOKABLE void method_overload(QString a) { invoke(18); m_actuals << a; } diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index b11ad2dd0e..908f63e7a3 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -770,7 +770,7 @@ void tst_qqmlecmascript::contextPropertiesTriggerReeval() context.setContextProperty("testObj", &object1); context.setContextProperty("testObj2", object3); - { + { MyExpression expr(&context, "testProp + 1"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant(2)); @@ -780,7 +780,7 @@ void tst_qqmlecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant(3)); } - { + { MyExpression expr(&context, "testProp + testProp + testProp"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant(6)); @@ -790,7 +790,7 @@ void tst_qqmlecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant(12)); } - { + { MyExpression expr(&context, "testObj.stringProperty"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant("Hello")); @@ -800,7 +800,7 @@ void tst_qqmlecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant("World")); } - { + { MyExpression expr(&context, "testObj.stringProperty /**/"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant("World")); @@ -810,7 +810,7 @@ void tst_qqmlecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant("Hello")); } - { + { MyExpression expr(&context, "testObj2"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant::fromValue((QObject *)object3)); @@ -831,7 +831,7 @@ void tst_qqmlecmascript::objectPropertiesTriggerReeval() object2.setStringProperty(QLatin1String("Dog")); object3.setStringProperty(QLatin1String("Cat")); - { + { MyExpression expr(&context, "testObj.stringProperty"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant("Hello")); @@ -841,7 +841,7 @@ void tst_qqmlecmascript::objectPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant("World")); } - { + { MyExpression expr(&context, "testObj.objectProperty.stringProperty"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant()); @@ -876,7 +876,7 @@ void tst_qqmlecmascript::objectPropertiesTriggerReeval() void tst_qqmlecmascript::deferredProperties() { QQmlComponent component(&engine, testFileUrl("deferredProperties.qml")); - MyDeferredObject *object = + MyDeferredObject *object = qobject_cast<MyDeferredObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->value(), 0); @@ -885,7 +885,7 @@ void tst_qqmlecmascript::deferredProperties() qmlExecuteDeferred(object); QCOMPARE(object->value(), 10); QVERIFY(object->objectProperty() != 0); - MyQmlObject *qmlObject = + MyQmlObject *qmlObject = qobject_cast<MyQmlObject *>(object->objectProperty()); QVERIFY(qmlObject != 0); QCOMPARE(qmlObject->value(), 10); @@ -899,7 +899,7 @@ void tst_qqmlecmascript::deferredProperties() void tst_qqmlecmascript::deferredPropertiesErrors() { QQmlComponent component(&engine, testFileUrl("deferredPropertiesErrors.qml")); - MyDeferredObject *object = + MyDeferredObject *object = qobject_cast<MyDeferredObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->value(), 0); @@ -961,7 +961,7 @@ void tst_qqmlecmascript::deferredPropertiesInDestruction() void tst_qqmlecmascript::extensionObjects() { QQmlComponent component(&engine, testFileUrl("extensionObjects.qml")); - MyExtendedObject *object = + MyExtendedObject *object = qobject_cast<MyExtendedObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->baseProperty(), 13); @@ -1153,7 +1153,7 @@ void tst_qqmlecmascript::valueTypeFunctions() delete obj; } -/* +/* Tests that writing a constant to a property with a binding on it disables the binding. */ @@ -1236,7 +1236,7 @@ the original binding to be disabled. */ void tst_qqmlecmascript::outerBindingOverridesInnerBinding() { - QQmlComponent component(&engine, + QQmlComponent component(&engine, testFileUrl("outerBindingOverridesInnerBinding.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -1259,7 +1259,7 @@ void tst_qqmlecmascript::outerBindingOverridesInnerBinding() } /* -Access a non-existent attached object. +Access a non-existent attached object. Tests for a regression where this used to crash. */ @@ -1916,7 +1916,7 @@ void tst_qqmlecmascript::propertyAssignmentErrors() delete object; } - + /* Test bindings still work when the reeval is triggered from within a signal script. @@ -2263,7 +2263,7 @@ void tst_qqmlecmascript::regExpBug() static inline bool evaluate_error(QV8Engine *engine, const QV4::ValueRef o, const char *source) { - QString functionSource = QLatin1String("(function(object) { return ") + + QString functionSource = QLatin1String("(function(object) { return ") + QLatin1String(source) + QLatin1String(" })"); QV4::Script program(QV8Engine::getV4(engine)->rootContext, functionSource); @@ -2291,7 +2291,7 @@ static inline bool evaluate_error(QV8Engine *engine, const QV4::ValueRef o, cons static inline bool evaluate_value(QV8Engine *engine, const QV4::ValueRef o, const char *source, const QV4::ValueRef result) { - QString functionSource = QLatin1String("(function(object) { return ") + + QString functionSource = QLatin1String("(function(object) { return ") + QLatin1String(source) + QLatin1String(" })"); QV4::Script program(QV8Engine::getV4(engine)->rootContext, functionSource); @@ -2323,7 +2323,7 @@ static inline bool evaluate_value(QV8Engine *engine, const QV4::ValueRef o, static inline QV4::ReturnedValue evaluate(QV8Engine *engine, const QV4::ValueRef o, const char *source) { - QString functionSource = QLatin1String("(function(object) { return ") + + QString functionSource = QLatin1String("(function(object) { return ") + QLatin1String(source) + QLatin1String(" })"); QV4::ExecutionContext *ctx = QV8Engine::getV4(engine)->currentContext(); @@ -2362,7 +2362,7 @@ void tst_qqmlecmascript::callQtInvokables() QQmlEngine qmlengine; QQmlEnginePrivate *ep = QQmlEnginePrivate::get(&qmlengine); - + QV8Engine *engine = ep->v8engine(); QV4::Scope scope(QV8Engine::getV4(engine)); @@ -3026,7 +3026,7 @@ void tst_qqmlecmascript::attachedPropertyScope() QObject *object = component.create(); QVERIFY(object != 0); - MyQmlAttachedObject *attached = + MyQmlAttachedObject *attached = qobject_cast<MyQmlAttachedObject *>(qmlAttachedPropertiesObject<MyQmlObject>(object)); QVERIFY(attached != 0); @@ -3241,7 +3241,7 @@ void tst_qqmlecmascript::ownership() QVERIFY(own.object != 0); QObject *object = component.create(context); - + engine.collectGarbage(); QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); @@ -3277,7 +3277,7 @@ public: QPointer<QObject> value; }; -// QTBUG-15695. +// QTBUG-15695. // Test setObjectOwnership(CppOwnership) works even when there is no QQmlData void tst_qqmlecmascript::cppOwnershipReturnValue() { @@ -5627,7 +5627,7 @@ void tst_qqmlecmascript::assignSequenceTypes() } } -// Test that assigning a null object works +// Test that assigning a null object works // Regressed with: df1788b4dbbb2826ae63f26bdf166342595343f4 void tst_qqmlecmascript::nullObjectBinding() { @@ -6278,7 +6278,7 @@ void tst_qqmlecmascript::aliasBindingsAssignCorrectly() // Test bindings assigned to alias properties override a binding on the target (QTBUG-13719) void tst_qqmlecmascript::aliasBindingsOverrideTarget() { - { + { QQmlComponent component(&engine, testFileUrl("aliasBindingsOverrideTarget.qml")); QObject *o = component.create(); QVERIFY(o != 0); |