aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlecmascript/data
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/data')
-rw-r--r--tests/auto/qml/qqmlecmascript/data/aliasBindingsAssignCorrectly.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/aliasBindingsOverrideTarget.3.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/aliasPropertyAndBinding.qml6
-rw-r--r--tests/auto/qml/qqmlecmascript/data/assignBasicTypes.2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/assignBasicTypes.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/bindingLoop.qml20
-rw-r--r--tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.2.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/constantsOverrideBindings.4.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/deletedEngine.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/dynamicDeletion.2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/eval.qml10
-rw-r--r--tests/auto/qml/qqmlecmascript/data/include.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/include_callback.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/include_remote.js8
-rw-r--r--tests/auto/qml/qqmlecmascript/data/include_remote_missing.js4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/include_shared.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/methods.1.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/methods.2.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/outerBindingOverridesInnerBinding.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/propertySplicing.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/propertyVar.2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.3.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scope.2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptConnect.1.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptConnect.2.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptConnect.3.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptConnect.4.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptConnect.5.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptConnect.6.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptDisconnect.1.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptDisconnect.2.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptDisconnect.3.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptDisconnect.4.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/scriptErrors.js2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/selfDeletingBinding.2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/signalAssignment.1.qml4
-rw-r--r--tests/auto/qml/qqmlecmascript/data/signalAssignment.2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/data/signalTriggeredBindings.qml2
42 files changed, 79 insertions, 79 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