Clean up various QML test-case scripts

End statements in JavsScript functions with semicolon, slightly
improve the naming of some variables, only use as many parentheses as
actually grant us some benefit.

Change-Id: Ib2c68a84366bf74b9bc2ab8145603170dc559ad4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

14 files changed, 209 insertions, 212 deletions

diff --git a/tests/auto/qml/qqmlecmascript/data/assignDate.1.qml b/tests/auto/qml/qqmlecmascript/data/assignDate.1.qml
index c48ed6d933..71e31b6ff3 100644
--- a/tests/auto/qml/qqmlecmascript/data/assignDate.1.qml
+++ b/tests/auto/qml/qqmlecmascript/data/assignDate.1.qml
@@ -3,34 +3,34 @@ import QtQuick 2.0
 
 MyTypeObject {
     Component.onCompleted: {
-        var dateVar = new Date(Date.UTC(2009, 4, 12))
-        var dateTimeVar = new Date(Date.UTC(2009, 4, 12, 0, 0, 1))
-        var dateTimeVar2 = new Date(Date.UTC(2009, 4, 12, 23, 59, 59))
+        var dateVar = new Date(Date.UTC(2009, 4, 12));
+        var dateTimeEarly = new Date(Date.UTC(2009, 4, 12, 0, 0, 1));
+        var dateTimeLate = new Date(Date.UTC(2009, 4, 12, 23, 59, 59));
 
-        dateProperty = dateVar
-        dateTimeProperty = dateTimeVar
-        dateTimeProperty2 = dateTimeVar2
+        dateProperty = dateVar;
+        dateTimeProperty = dateTimeEarly;
+        dateTimeProperty2 = dateTimeLate;
 
-        boolProperty = (dateProperty.getTime() == dateVar.getTime()) &&
-                       (dateProperty.getUTCFullYear() == 2009) &&
-                       (dateProperty.getUTCMonth() == 5-1) &&
-                       (dateProperty.getUTCDate() == 12) &&
-                       (dateProperty.getUTCHours() == 0) &&
-                       (dateProperty.getUTCMinutes() == 0) &&
-                       (dateProperty.getUTCSeconds() == 0) &&
-                       (dateTimeProperty.getTime() == dateTimeVar.getTime()) &&
-                       (dateTimeProperty.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty.getUTCDate() == 12) &&
-                       (dateTimeProperty.getUTCHours() == 0) &&
-                       (dateTimeProperty.getUTCMinutes() == 0) &&
-                       (dateTimeProperty.getUTCSeconds() == 1) &&
-                       (dateTimeProperty2.getTime() == dateTimeVar2.getTime()) &&
-                       (dateTimeProperty2.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty2.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty2.getUTCDate() == 12) &&
-                       (dateTimeProperty2.getUTCHours() == 23) &&
-                       (dateTimeProperty2.getUTCMinutes() == 59) &&
-                       (dateTimeProperty2.getUTCSeconds() == 59)
+        boolProperty = (dateProperty.getTime() == dateVar.getTime() &&
+                        dateProperty.getUTCFullYear() == 2009 &&
+                        dateProperty.getUTCMonth() == 5-1 &&
+                        dateProperty.getUTCDate() == 12 &&
+                        dateProperty.getUTCHours() == 0 &&
+                        dateProperty.getUTCMinutes() == 0 &&
+                        dateProperty.getUTCSeconds() == 0 &&
+                        dateTimeProperty.getTime() == dateTimeEarly.getTime() &&
+                        dateTimeProperty.getUTCFullYear() == 2009 &&
+                        dateTimeProperty.getUTCMonth() == 5-1 &&
+                        dateTimeProperty.getUTCDate() == 12 &&
+                        dateTimeProperty.getUTCHours() == 0 &&
+                        dateTimeProperty.getUTCMinutes() == 0 &&
+                        dateTimeProperty.getUTCSeconds() == 1 &&
+                        dateTimeProperty2.getTime() == dateTimeLate.getTime() &&
+                        dateTimeProperty2.getUTCFullYear() == 2009 &&
+                        dateTimeProperty2.getUTCMonth() == 5-1 &&
+                        dateTimeProperty2.getUTCDate() == 12 &&
+                        dateTimeProperty2.getUTCHours() == 23 &&
+                        dateTimeProperty2.getUTCMinutes() == 59 &&
+                        dateTimeProperty2.getUTCSeconds() == 59);
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/assignDate.2.qml b/tests/auto/qml/qqmlecmascript/data/assignDate.2.qml
index 3b519eeb96..32a1d30bcf 100644
--- a/tests/auto/qml/qqmlecmascript/data/assignDate.2.qml
+++ b/tests/auto/qml/qqmlecmascript/data/assignDate.2.qml
@@ -8,30 +8,30 @@ MyTypeObject {
 
     boolProperty: false
     Component.onCompleted: {
-        var dateVar = new Date("2009-05-12")
-        var dateTimeVar = new Date("2009-05-12T00:00:01")
-        var dateTimeVar2 = new Date("2009-05-12T23:59:59")
+        var dateVar = new Date("2009-05-12");
+        var dateTimeEarly = new Date("2009-05-12T00:00:01");
+        var dateTimeLate = new Date("2009-05-12T23:59:59");
 
-        boolProperty = (dateProperty.getTime() == dateVar.getTime()) &&
-                       (dateProperty.getUTCFullYear() == 2009) &&
-                       (dateProperty.getUTCMonth() == 5-1) &&
-                       (dateProperty.getUTCDate() == 12) &&
-                       (dateProperty.getUTCHours() == 0) &&
-                       (dateProperty.getUTCMinutes() == 0) &&
-                       (dateProperty.getUTCSeconds() == 0) &&
-                       (dateTimeProperty.getTime() == dateTimeVar.getTime()) &&
-                       (dateTimeProperty.getFullYear() == 2009) &&
-                       (dateTimeProperty.getMonth() == 5-1) &&
-                       (dateTimeProperty.getDate() == 12) &&
-                       (dateTimeProperty.getHours() == 0) &&
-                       (dateTimeProperty.getMinutes() == 0) &&
-                       (dateTimeProperty.getSeconds() == 1) &&
-                       (dateTimeProperty2.getTime() == dateTimeVar2.getTime()) &&
-                       (dateTimeProperty2.getFullYear() == 2009) &&
-                       (dateTimeProperty2.getMonth() == 5-1) &&
-                       (dateTimeProperty2.getDate() == 12) &&
-                       (dateTimeProperty2.getHours() == 23) &&
-                       (dateTimeProperty2.getMinutes() == 59) &&
-                       (dateTimeProperty2.getSeconds() == 59)
+        boolProperty = (dateProperty.getTime() == dateVar.getTime() &&
+                        dateProperty.getUTCFullYear() == 2009 &&
+                        dateProperty.getUTCMonth() == 5-1 &&
+                        dateProperty.getUTCDate() == 12 &&
+                        dateProperty.getUTCHours() == 0 &&
+                        dateProperty.getUTCMinutes() == 0 &&
+                        dateProperty.getUTCSeconds() == 0 &&
+                        dateTimeProperty.getTime() == dateTimeEarly.getTime() &&
+                        dateTimeProperty.getFullYear() == 2009 &&
+                        dateTimeProperty.getMonth() == 5-1 &&
+                        dateTimeProperty.getDate() == 12 &&
+                        dateTimeProperty.getHours() == 0 &&
+                        dateTimeProperty.getMinutes() == 0 &&
+                        dateTimeProperty.getSeconds() == 1 &&
+                        dateTimeProperty2.getTime() == dateTimeLate.getTime() &&
+                        dateTimeProperty2.getFullYear() == 2009 &&
+                        dateTimeProperty2.getMonth() == 5-1 &&
+                        dateTimeProperty2.getDate() == 12 &&
+                        dateTimeProperty2.getHours() == 23 &&
+                        dateTimeProperty2.getMinutes() == 59 &&
+                        dateTimeProperty2.getSeconds() == 59);
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/assignDate.3.qml b/tests/auto/qml/qqmlecmascript/data/assignDate.3.qml
index eef48091bb..d7d9d7ee13 100644
--- a/tests/auto/qml/qqmlecmascript/data/assignDate.3.qml
+++ b/tests/auto/qml/qqmlecmascript/data/assignDate.3.qml
@@ -8,30 +8,30 @@ MyTypeObject {
 
     boolProperty: false
     Component.onCompleted: {
-        var dateVar = new Date("2009-05-12")
-        var dateTimeVar = new Date("2009-05-12T00:00:01Z")
-        var dateTimeVar2 = new Date("2009-05-12T23:59:59Z")
+        var dateVar = new Date("2009-05-12");
+        var dateTimeEarly = new Date("2009-05-12T00:00:01Z");
+        var dateTimeLate = new Date("2009-05-12T23:59:59Z");
 
-        boolProperty = (dateProperty.getTime() == dateVar.getTime()) &&
-                       (dateProperty.getUTCFullYear() == 2009) &&
-                       (dateProperty.getUTCMonth() == 5-1) &&
-                       (dateProperty.getUTCDate() == 12) &&
-                       (dateProperty.getUTCHours() == 0) &&
-                       (dateProperty.getUTCMinutes() == 0) &&
-                       (dateProperty.getUTCSeconds() == 0) &&
-                       (dateTimeProperty.getTime() == dateTimeVar.getTime()) &&
-                       (dateTimeProperty.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty.getUTCDate() == 12) &&
-                       (dateTimeProperty.getUTCHours() == 0) &&
-                       (dateTimeProperty.getUTCMinutes() == 0) &&
-                       (dateTimeProperty.getUTCSeconds() == 1) &&
-                       (dateTimeProperty2.getTime() == dateTimeVar2.getTime()) &&
-                       (dateTimeProperty2.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty2.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty2.getUTCDate() == 12) &&
-                       (dateTimeProperty2.getUTCHours() == 23) &&
-                       (dateTimeProperty2.getUTCMinutes() == 59) &&
-                       (dateTimeProperty2.getUTCSeconds() == 59)
+        boolProperty = (dateProperty.getTime() == dateVar.getTime() &&
+                        dateProperty.getUTCFullYear() == 2009 &&
+                        dateProperty.getUTCMonth() == 5-1 &&
+                        dateProperty.getUTCDate() == 12 &&
+                        dateProperty.getUTCHours() == 0 &&
+                        dateProperty.getUTCMinutes() == 0 &&
+                        dateProperty.getUTCSeconds() == 0 &&
+                        dateTimeProperty.getTime() == dateTimeEarly.getTime() &&
+                        dateTimeProperty.getUTCFullYear() == 2009 &&
+                        dateTimeProperty.getUTCMonth() == 5-1 &&
+                        dateTimeProperty.getUTCDate() == 12 &&
+                        dateTimeProperty.getUTCHours() == 0 &&
+                        dateTimeProperty.getUTCMinutes() == 0 &&
+                        dateTimeProperty.getUTCSeconds() == 1 &&
+                        dateTimeProperty2.getTime() == dateTimeLate.getTime() &&
+                        dateTimeProperty2.getUTCFullYear() == 2009 &&
+                        dateTimeProperty2.getUTCMonth() == 5-1 &&
+                        dateTimeProperty2.getUTCDate() == 12 &&
+                        dateTimeProperty2.getUTCHours() == 23 &&
+                        dateTimeProperty2.getUTCMinutes() == 59 &&
+                        dateTimeProperty2.getUTCSeconds() == 59);
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/assignDate.4.qml b/tests/auto/qml/qqmlecmascript/data/assignDate.4.qml
index d4d31b1902..0c034b8699 100644
--- a/tests/auto/qml/qqmlecmascript/data/assignDate.4.qml
+++ b/tests/auto/qml/qqmlecmascript/data/assignDate.4.qml
@@ -8,30 +8,30 @@ MyTypeObject {
 
     boolProperty: false
     Component.onCompleted: {
-        var dateVar = new Date("2009-05-12")
-        var dateTimeVar = new Date("2009-05-12T00:00:01Z")
-        var dateTimeVar2 = new Date("2009-05-12T23:59:59Z")
+        var dateVar = new Date("2009-05-12");
+        var dateTimeEarly = new Date("2009-05-12T00:00:01Z");
+        var dateTimeLate = new Date("2009-05-12T23:59:59Z");
 
-        boolProperty = (dateProperty.getTime() == dateVar.getTime()) &&
-                       (dateProperty.getUTCFullYear() == 2009) &&
-                       (dateProperty.getUTCMonth() == 5-1) &&
-                       (dateProperty.getUTCDate() == 12) &&
-                       (dateProperty.getUTCHours() == 0) &&
-                       (dateProperty.getUTCMinutes() == 0) &&
-                       (dateProperty.getUTCSeconds() == 0) &&
-                       (dateTimeProperty.getTime() == dateTimeVar.getTime()) &&
-                       (dateTimeProperty.getFullYear() == 2009) &&
-                       (dateTimeProperty.getMonth() == 5-1) &&
-                       (dateTimeProperty.getUTCDate() == 12) &&
-                       (dateTimeProperty.getUTCHours() == 0) &&
-                       (dateTimeProperty.getUTCMinutes() == 0) &&
-                       (dateTimeProperty.getUTCSeconds() == 1) &&
-                       (dateTimeProperty2.getTime() == dateTimeVar2.getTime()) &&
-                       (dateTimeProperty2.getFullYear() == 2009) &&
-                       (dateTimeProperty2.getMonth() == 5-1) &&
-                       (dateTimeProperty2.getUTCDate() == 12) &&
-                       (dateTimeProperty2.getUTCHours() == 23) &&
-                       (dateTimeProperty2.getUTCMinutes() == 59) &&
-                       (dateTimeProperty2.getUTCSeconds() == 59)
+        boolProperty = (dateProperty.getTime() == dateVar.getTime() &&
+                        dateProperty.getUTCFullYear() == 2009 &&
+                        dateProperty.getUTCMonth() == 5-1 &&
+                        dateProperty.getUTCDate() == 12 &&
+                        dateProperty.getUTCHours() == 0 &&
+                        dateProperty.getUTCMinutes() == 0 &&
+                        dateProperty.getUTCSeconds() == 0 &&
+                        dateTimeProperty.getTime() == dateTimeEarly.getTime() &&
+                        dateTimeProperty.getFullYear() == 2009 &&
+                        dateTimeProperty.getMonth() == 5-1 &&
+                        dateTimeProperty.getUTCDate() == 12 &&
+                        dateTimeProperty.getUTCHours() == 0 &&
+                        dateTimeProperty.getUTCMinutes() == 0 &&
+                        dateTimeProperty.getUTCSeconds() == 1 &&
+                        dateTimeProperty2.getTime() == dateTimeLate.getTime() &&
+                        dateTimeProperty2.getFullYear() == 2009 &&
+                        dateTimeProperty2.getMonth() == 5-1 &&
+                        dateTimeProperty2.getUTCDate() == 12 &&
+                        dateTimeProperty2.getUTCHours() == 23 &&
+                        dateTimeProperty2.getUTCMinutes() == 59 &&
+                        dateTimeProperty2.getUTCSeconds() == 59);
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/assignDate.5.qml b/tests/auto/qml/qqmlecmascript/data/assignDate.5.qml
index bfb8e6bdc1..274b6d6c54 100644
--- a/tests/auto/qml/qqmlecmascript/data/assignDate.5.qml
+++ b/tests/auto/qml/qqmlecmascript/data/assignDate.5.qml
@@ -8,30 +8,30 @@ MyTypeObject {
 
     boolProperty: false
     Component.onCompleted: {
-        var dateVar = new Date("2009-05-12")
-        var dateTimeVar = new Date("2009-05-12T00:00:01+02:00")
-        var dateTimeVar2 = new Date("2009-05-12T23:59:59+02:00")
+        var dateVar = new Date("2009-05-12");
+        var dateTimeEarly = new Date("2009-05-12T00:00:01+02:00");
+        var dateTimeLate = new Date("2009-05-12T23:59:59+02:00");
 
-        boolProperty = (dateProperty.getTime() == dateVar.getTime()) &&
-                       (dateProperty.getUTCFullYear() == 2009) &&
-                       (dateProperty.getUTCMonth() == 5-1) &&
-                       (dateProperty.getUTCDate() == 12) &&
-                       (dateProperty.getUTCHours() == 0) &&
-                       (dateProperty.getUTCMinutes() == 0) &&
-                       (dateProperty.getUTCSeconds() == 0) &&
-                       (dateTimeProperty.getTime() == dateTimeVar.getTime()) &&
-                       (dateTimeProperty.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty.getUTCDate() == 11) &&
-                       (dateTimeProperty.getUTCHours() == 22) &&
-                       (dateTimeProperty.getUTCMinutes() == 0) &&
-                       (dateTimeProperty.getUTCSeconds() == 1) &&
-                       (dateTimeProperty2.getTime() == dateTimeVar2.getTime()) &&
-                       (dateTimeProperty2.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty2.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty2.getUTCDate() == 12) &&
-                       (dateTimeProperty2.getUTCHours() == 21) &&
-                       (dateTimeProperty2.getUTCMinutes() == 59) &&
-                       (dateTimeProperty2.getUTCSeconds() == 59)
+        boolProperty = (dateProperty.getTime() == dateVar.getTime() &&
+                        dateProperty.getUTCFullYear() == 2009 &&
+                        dateProperty.getUTCMonth() == 5-1 &&
+                        dateProperty.getUTCDate() == 12 &&
+                        dateProperty.getUTCHours() == 0 &&
+                        dateProperty.getUTCMinutes() == 0 &&
+                        dateProperty.getUTCSeconds() == 0 &&
+                        dateTimeProperty.getTime() == dateTimeEarly.getTime() &&
+                        dateTimeProperty.getUTCFullYear() == 2009 &&
+                        dateTimeProperty.getUTCMonth() == 5-1 &&
+                        dateTimeProperty.getUTCDate() == 11 &&
+                        dateTimeProperty.getUTCHours() == 22 &&
+                        dateTimeProperty.getUTCMinutes() == 0 &&
+                        dateTimeProperty.getUTCSeconds() == 1 &&
+                        dateTimeProperty2.getTime() == dateTimeLate.getTime() &&
+                        dateTimeProperty2.getUTCFullYear() == 2009 &&
+                        dateTimeProperty2.getUTCMonth() == 5-1 &&
+                        dateTimeProperty2.getUTCDate() == 12 &&
+                        dateTimeProperty2.getUTCHours() == 21 &&
+                        dateTimeProperty2.getUTCMinutes() == 59 &&
+                        dateTimeProperty2.getUTCSeconds() == 59);
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/assignDate.6.qml b/tests/auto/qml/qqmlecmascript/data/assignDate.6.qml
index 099bc070ea..13de1d353f 100644
--- a/tests/auto/qml/qqmlecmascript/data/assignDate.6.qml
+++ b/tests/auto/qml/qqmlecmascript/data/assignDate.6.qml
@@ -8,30 +8,30 @@ MyTypeObject {
 
     boolProperty: false
     Component.onCompleted: {
-        var dateVar = new Date("2009-05-12")
-        var dateTimeVar = new Date("2009-05-12T00:00:01+02:00")
-        var dateTimeVar2 = new Date("2009-05-12T23:59:59+02:00")
+        var dateVar = new Date("2009-05-12");
+        var dateTimeEarly = new Date("2009-05-12T00:00:01+02:00");
+        var dateTimeLate = new Date("2009-05-12T23:59:59+02:00");
 
-        boolProperty = (dateProperty.getTime() == dateVar.getTime()) &&
-                       (dateProperty.getUTCFullYear() == 2009) &&
-                       (dateProperty.getUTCMonth() == 5-1) &&
-                       (dateProperty.getUTCDate() == 12) &&
-                       (dateProperty.getUTCHours() == 0) &&
-                       (dateProperty.getUTCMinutes() == 0) &&
-                       (dateProperty.getUTCSeconds() == 0) &&
-                       (dateTimeProperty.getTime() == dateTimeVar.getTime()) &&
-                       (dateTimeProperty.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty.getUTCDate() == 11) &&
-                       (dateTimeProperty.getUTCHours() == 22) &&
-                       (dateTimeProperty.getUTCMinutes() == 0) &&
-                       (dateTimeProperty.getUTCSeconds() == 1) &&
-                       (dateTimeProperty2.getTime() == dateTimeVar2.getTime()) &&
-                       (dateTimeProperty2.getUTCFullYear() == 2009) &&
-                       (dateTimeProperty2.getUTCMonth() == 5-1) &&
-                       (dateTimeProperty2.getUTCDate() == 12) &&
-                       (dateTimeProperty2.getUTCHours() == 21) &&
-                       (dateTimeProperty2.getUTCMinutes() == 59) &&
-                       (dateTimeProperty2.getUTCSeconds() == 59)
+        boolProperty = (dateProperty.getTime() == dateVar.getTime() &&
+                        dateProperty.getUTCFullYear() == 2009 &&
+                        dateProperty.getUTCMonth() == 5-1 &&
+                        dateProperty.getUTCDate() == 12 &&
+                        dateProperty.getUTCHours() == 0 &&
+                        dateProperty.getUTCMinutes() == 0 &&
+                        dateProperty.getUTCSeconds() == 0 &&
+                        dateTimeProperty.getTime() == dateTimeEarly.getTime() &&
+                        dateTimeProperty.getUTCFullYear() == 2009 &&
+                        dateTimeProperty.getUTCMonth() == 5-1 &&
+                        dateTimeProperty.getUTCDate() == 11 &&
+                        dateTimeProperty.getUTCHours() == 22 &&
+                        dateTimeProperty.getUTCMinutes() == 0 &&
+                        dateTimeProperty.getUTCSeconds() == 1 &&
+                        dateTimeProperty2.getTime() == dateTimeLate.getTime() &&
+                        dateTimeProperty2.getUTCFullYear() == 2009 &&
+                        dateTimeProperty2.getUTCMonth() == 5-1 &&
+                        dateTimeProperty2.getUTCDate() == 12 &&
+                        dateTimeProperty2.getUTCHours() == 21 &&
+                        dateTimeProperty2.getUTCMinutes() == 59 &&
+                        dateTimeProperty2.getUTCSeconds() == 59);
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml
index d74a2901c9..a15cda99bf 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml
@@ -5,29 +5,26 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 23:59:59 (local time)
-        var compare = new Date(2009, 5-1, 12, 23, 59, 59)
-        var compareOffset = compare.getTimezoneOffset()
+        // The test date is 2009-05-12 23:59:59 (local time)
+        var compare = new Date(2009, 5-1, 12, 23, 59, 59);
+        var compareOffset = compare.getTimezoneOffset();
 
-        // The date is already in local time, so we can use the partial values directly
-        var dtAdjusted = dt
-
-        boolProperty = (dt.getTime() == compare.getTime()) &&
-                       (offset == compareOffset) &&
-                       (timespec == 'LocalTime') &&
-                       (dtAdjusted.getFullYear() == 2009) &&
-                       (dtAdjusted.getMonth() == 5-1) &&
-                       (dtAdjusted.getDate() == 12) &&
-                       (dtAdjusted.getHours() == 23) &&
-                       (dtAdjusted.getMinutes() == 59) &&
-                       (dtAdjusted.getSeconds() == 59) &&
-                       (date.getUTCFullYear() == 2009) &&
-                       (date.getUTCMonth() == 5-1) &&
-                       (date.getUTCDate() == 12);
+        boolProperty = (dt.getTime() == compare.getTime() &&
+                        offset == compareOffset &&
+                        timespec == 'LocalTime' &&
+                        dt.getFullYear() == 2009 &&
+                        dt.getMonth() == 5-1 &&
+                        dt.getDate() == 12 &&
+                        dt.getHours() == 23 &&
+                        dt.getMinutes() == 59 &&
+                        dt.getSeconds() == 59 &&
+                        date.getUTCFullYear() == 2009 &&
+                        date.getUTCMonth() == 5-1 &&
+                        date.getUTCDate() == 12);
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.3.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.3.qml
index dde958d6e3..3d707afd1f 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.3.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.3.qml
@@ -5,13 +5,13 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 00:00:01 (UTC)
-        var compare = new Date(Date.UTC(2009, 5-1, 12, 0, 0, 1))
+        // The test date is 2009-05-12 00:00:01 (UTC)
+        var compare = new Date(Date.UTC(2009, 5-1, 12, 0, 0, 1));
 
         boolProperty = (dt.getTime() == compare.getTime() &&
                         offset == 0 &&
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.4.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.4.qml
index 3781b719bb..225136ab99 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.4.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.4.qml
@@ -5,13 +5,13 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 23:59:59 (UTC)
-        var compare = new Date(Date.UTC(2009, 5-1, 12, 23, 59, 59))
+        // The test date is 2009-05-12 23:59:59 (UTC)
+        var compare = new Date(Date.UTC(2009, 5-1, 12, 23, 59, 59));
 
         boolProperty = (dt.getTime() == compare.getTime() &&
                         offset == 0 &&
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.5.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.5.qml
index faefb38956..90b37b9b37 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.5.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.5.qml
@@ -5,13 +5,13 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 00:00:01 (UTC+11:30)
-        var compare = new Date('2009-05-12T00:00:01+11:30')
+        // The test date is 2009-05-12 00:00:01 (UTC+11:30)
+        var compare = new Date('2009-05-12T00:00:01+11:30');
         // That's 2009-05-11 12:30:01 UTC
 
         boolProperty = (dt.getTime() == compare.getTime() &&
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.6.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.6.qml
index 3117400b3a..c3e7154828 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.6.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.6.qml
@@ -5,13 +5,13 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 23:59:59 (UTC+11:30)
-        var compare = new Date('2009-05-12T23:59:59+11:30')
+        // The test date is 2009-05-12 23:59:59 (UTC+11:30)
+        var compare = new Date('2009-05-12T23:59:59+11:30');
         // That's 2009-05-12 12:29:59 UTC
 
         boolProperty = (dt.getTime() == compare.getTime() &&
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.7.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.7.qml
index 5612cbbe23..434a33d168 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.7.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.7.qml
@@ -5,13 +5,13 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 00:00:01 (UTC-11:30)
-        var compare = new Date('2009-05-12T00:00:01-11:30')
+        // The test date is 2009-05-12 00:00:01 (UTC-11:30)
+        var compare = new Date('2009-05-12T00:00:01-11:30');
         // That's 2009-05-12 11:30:01 UTC
 
         boolProperty = (dt.getTime() == compare.getTime() &&
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.8.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.8.qml
index 8bb3b0ae1d..14e3cebe20 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.8.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.8.qml
@@ -5,13 +5,13 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 23:59:59 (UTC-11:30)
-        var compare = new Date('2009-05-12T23:59:59-11:30')
+        // The test date is 2009-05-12 23:59:59 (UTC-11:30)
+        var compare = new Date('2009-05-12T23:59:59-11:30');
         // That's 2009-05-13 11:29:59 UTC
 
         boolProperty = (dt.getTime() == compare.getTime() &&
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.qml
index 225422b5e3..dadd2a9847 100644
--- a/tests/auto/qml/qqmlecmascript/data/exportDate.qml
+++ b/tests/auto/qml/qqmlecmascript/data/exportDate.qml
@@ -5,14 +5,14 @@ MyTypeObject {
     boolProperty: false
 
     Component.onCompleted: {
-        var dt = datetimeExporter.getDateTime()
-        var offset = datetimeExporter.getDateTimeOffset()
-        var date = datetimeExporter.getDate()
-        var timespec = datetimeExporter.getTimeSpec()
+        var dt = datetimeExporter.getDateTime();
+        var offset = datetimeExporter.getDateTimeOffset();
+        var date = datetimeExporter.getDate();
+        var timespec = datetimeExporter.getTimeSpec();
 
-        // The test date is 2009-5-12 00:00:01 (local time)
-        var compare = new Date(2009, 5-1, 12, 0, 0, 1)
-        var compareOffset = compare.getTimezoneOffset()
+        // The test date is 2009-05-12 00:00:01 (local time)
+        var compare = new Date(2009, 5-1, 12, 0, 0, 1);
+        var compareOffset = compare.getTimezoneOffset();
 
         boolProperty = (dt.getTime() == compare.getTime() &&
                         offset == compareOffset &&