aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/particles/qquickgroupgoal/data/basic.qml2
-rw-r--r--tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp4
-rw-r--r--tests/auto/qml/debugger/shared/qqmldebugclient.cpp2
-rw-r--r--tests/auto/qml/parserstress/tests/shell.js36
-rw-r--r--tests/auto/qml/qqmlcomponent/data/incubateObject.qml4
-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
-rw-r--r--tests/auto/qml/qqmlecmascript/testtypes.h6
-rw-r--r--tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp48
-rw-r--r--tests/auto/qml/qqmlengine/qqmlengine.pro2
-rw-r--r--tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp2
-rw-r--r--tests/auto/qml/qqmllanguage/data/NestedAlias.qml4
-rw-r--r--tests/auto/qml/qqmllanguage/data/OnCompletedType.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/OnDestructionType.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/alias.4.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/alias.5.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/defaultPropertyListOrder.qml4
-rw-r--r--tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.2.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/interfaceQList.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.2.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/nonexistantProperty.3.qml4
-rw-r--r--tests/auto/qml/qqmllanguage/data/onCompleted.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/data/onDestruction.qml2
-rw-r--r--tests/auto/qml/qqmllanguage/testtypes.h2
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp28
-rw-r--r--tests/auto/qml/qqmllistmodel/data/multipleroles.qml6
-rw-r--r--tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp6
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp2
-rw-r--r--tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml2
-rw-r--r--tests/auto/qml/qqmlvaluetypes/data/conflicting.2.qml2
-rw-r--r--tests/auto/qml/qqmlvaluetypes/data/conflicting.3.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml4
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/element.qml4
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml36
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml52
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/status.qml36
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml36
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp18
-rw-r--r--tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp4
-rw-r--r--tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp2
-rw-r--r--tests/auto/quick/qquickanimations/data/runningTrueBug.qml2
-rw-r--r--tests/auto/quick/qquickgridview/data/gridview-enforcerange.qml2
-rw-r--r--tests/auto/quick/qquickgridview/data/propertychangestest.qml8
-rw-r--r--tests/auto/quick/qquickimage/data/aspectratio.qml2
-rw-r--r--tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp12
-rw-r--r--tests/auto/quick/qquickitem2/data/childrenRectBug3.qml2
-rw-r--r--tests/auto/quick/qquicklistview/data/listview-enforcerange.qml2
-rw-r--r--tests/auto/quick/qquicklistview/data/propertychangestest.qml8
-rw-r--r--tests/auto/quick/qquicklistview/incrementalmodel.cpp6
-rw-r--r--tests/auto/quick/qquickmousearea/data/dragproperties.qml2
-rw-r--r--tests/auto/quick/qquickmousearea/data/dragreset.qml2
-rw-r--r--tests/auto/quick/qquickpathview/data/propertychanges.qml4
-rw-r--r--tests/auto/quick/qquickrepeater/data/properties.qml10
-rw-r--r--tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp2
-rw-r--r--tests/auto/quick/qquicktextedit/data/http/cursorHttpTest.qml4
-rw-r--r--tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail1.qml4
-rw-r--r--tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail2.qml4
-rw-r--r--tests/auto/quick/qquicktextedit/data/http/cursorHttpTestPass.qml4
-rw-r--r--tests/auto/quick/qquicktextedit/data/inputmethodhints.qml2
-rw-r--r--tests/auto/quick/qquicktextedit/data/navigation.qml4
-rw-r--r--tests/auto/quick/qquicktextinput/data/navigation.qml4
-rw-r--r--tests/auto/quick/qquicktextinput/data/validators.qml2
-rw-r--r--tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp10
-rw-r--r--tests/auto/shared/testhttpserver.cpp6
115 files changed, 333 insertions, 333 deletions
diff --git a/tests/auto/particles/qquickgroupgoal/data/basic.qml b/tests/auto/particles/qquickgroupgoal/data/basic.qml
index 8e25a4dc3f..8e3833916f 100644
--- a/tests/auto/particles/qquickgroupgoal/data/basic.qml
+++ b/tests/auto/particles/qquickgroupgoal/data/basic.qml
@@ -61,7 +61,7 @@ Rectangle {
goalState: ""
jump: true
}
-
+
Emitter {
//0,0 position
group: "notdefault"
diff --git a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
index 7fd1f47838..26919af1b6 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -82,10 +82,10 @@ void tst_QPacketProtocol::init()
m_server = new QTcpServer(this);
m_serverConn = 0;
QVERIFY(m_server->listen(QHostAddress("127.0.0.1")));
-
+
m_client = new QTcpSocket(this);
m_client->connectToHost(m_server->serverAddress(), m_server->serverPort());
-
+
QVERIFY(m_client->waitForConnected());
QVERIFY(m_server->waitForNewConnection(10000));
m_serverConn = m_server->nextPendingConnection();
diff --git a/tests/auto/qml/debugger/shared/qqmldebugclient.cpp b/tests/auto/qml/debugger/shared/qqmldebugclient.cpp
index 6474a04796..80322dc841 100644
--- a/tests/auto/qml/debugger/shared/qqmldebugclient.cpp
+++ b/tests/auto/qml/debugger/shared/qqmldebugclient.cpp
@@ -388,7 +388,7 @@ QQmlDebugClientPrivate::QQmlDebugClientPrivate()
{
}
-QQmlDebugClient::QQmlDebugClient(const QString &name,
+QQmlDebugClient::QQmlDebugClient(const QString &name,
QQmlDebugConnection *parent)
: QObject(parent),
d(new QQmlDebugClientPrivate)
diff --git a/tests/auto/qml/parserstress/tests/shell.js b/tests/auto/qml/parserstress/tests/shell.js
index 40af0f3799..b3a84cc2ed 100644
--- a/tests/auto/qml/parserstress/tests/shell.js
+++ b/tests/auto/qml/parserstress/tests/shell.js
@@ -191,7 +191,7 @@ function reportFailure (msg)
var l;
var funcName = currentFunc();
var prefix = (funcName) ? "[reported from " + funcName + "] ": "";
-
+
for (var i=0; i<lines.length; i++)
print (FAILED + prefix + lines[i]);
}
@@ -224,11 +224,11 @@ function printBugNumber (num)
function toPrinted(value)
{
- if (typeof value == "xml")
+ if (typeof value == "xml")
{
value = value.toXMLString();
- }
- else
+ }
+ else
{
value = String(value);
}
@@ -406,7 +406,7 @@ function enterFunc (funcName)
function exitFunc (funcName)
{
var lastFunc = callStack.pop();
-
+
if (funcName)
{
if (!funcName.match(/\(\)$/))
@@ -516,7 +516,7 @@ function BigO(data)
{
var Ydiff = Y[i] - this.Yavg;
var Xdiff = X[i] - this.Xavg;
-
+
SUM_Ydiff2 += Ydiff * Ydiff;
SUM_Xdiff2 += Xdiff * Xdiff;
SUM_XdiffYdiff += Xdiff * Ydiff;
@@ -552,7 +552,7 @@ function BigO(data)
{
deriv.X[i] = (X[i] + X[i+1])/2;
deriv.Y[i] = (Y[i+1] - Y[i])/(X[i+1] - X[i]);
- }
+ }
return deriv;
}
@@ -628,7 +628,7 @@ function optionsInit() {
}
function optionsClear() {
-
+
// turn off current settings
var optionNames = options().split(',');
for (var i = 0; i < optionNames.length; i++)
@@ -696,27 +696,27 @@ function getTestCaseResult(expected, actual)
var expected_t = typeof expected;
var actual_t = typeof actual;
var passed = true;
-
+
// because ( NaN == NaN ) always returns false, need to do
// a special compare to see if we got the right result.
- if ( actual != actual )
+ if ( actual != actual )
{
- if ( actual_t == "object" )
+ if ( actual_t == "object" )
{
actual = "NaN object";
- }
- else
+ }
+ else
{
actual = "NaN number";
}
}
- if ( expected != expected )
+ if ( expected != expected )
{
- if ( expected_t == "object" )
+ if ( expected_t == "object" )
{
expected = "NaN object";
- }
- else
+ }
+ else
{
expected = "NaN number";
}
@@ -733,7 +733,7 @@ function getTestCaseResult(expected, actual)
passed = false;
}
}
-
+
return passed;
}
diff --git a/tests/auto/qml/qqmlcomponent/data/incubateObject.qml b/tests/auto/qml/qqmlcomponent/data/incubateObject.qml
index c11319db30..fcc88a7647 100644
--- a/tests/auto/qml/qqmlcomponent/data/incubateObject.qml
+++ b/tests/auto/qml/qqmlcomponent/data/incubateObject.qml
@@ -8,12 +8,12 @@ Item{
property var i
- Component{
+ Component{
id: component
Item {
property int dummy: 13
property int dummy2: 26
- }
+ }
}
Component.onCompleted: {
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);
diff --git a/tests/auto/qml/qqmlengine/qqmlengine.pro b/tests/auto/qml/qqmlengine/qqmlengine.pro
index fd8c463742..e84512fae3 100644
--- a/tests/auto/qml/qqmlengine/qqmlengine.pro
+++ b/tests/auto/qml/qqmlengine/qqmlengine.pro
@@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
-SOURCES += tst_qqmlengine.cpp
+SOURCES += tst_qqmlengine.cpp
QT += core-private gui-private qml-private network testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
index 9d62aa2984..0c8424aaba 100644
--- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
+++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
@@ -486,7 +486,7 @@ void tst_qqmlinstruction::dump()
}
QStringList expect;
- expect
+ expect
<< "Index\tOperation\t\tData1\tData2\tData3\tComments"
<< "-------------------------------------------------------------------------------"
<< "0\t\tINIT\t\t\t0\t3\t-1\t-1"
diff --git a/tests/auto/qml/qqmllanguage/data/NestedAlias.qml b/tests/auto/qml/qqmllanguage/data/NestedAlias.qml
index 7d49b0ac98..3606836e96 100644
--- a/tests/auto/qml/qqmllanguage/data/NestedAlias.qml
+++ b/tests/auto/qml/qqmllanguage/data/NestedAlias.qml
@@ -7,8 +7,8 @@ QtObject {
property alias a: object2.a
o1: QtObject { id: object1 }
- o2: QtObject {
- id: object2
+ o2: QtObject {
+ id: object2
property int a: 1923
}
}
diff --git a/tests/auto/qml/qqmllanguage/data/OnCompletedType.qml b/tests/auto/qml/qqmllanguage/data/OnCompletedType.qml
index 947f14811f..6b589fb612 100644
--- a/tests/auto/qml/qqmllanguage/data/OnCompletedType.qml
+++ b/tests/auto/qml/qqmllanguage/data/OnCompletedType.qml
@@ -3,6 +3,6 @@ import QtQuick 2.0
MyQmlObject {
property int a: Math.max(10, 9)
- property int b: 11
+ property int b: 11
Component.onCompleted: console.log("Completed " + a + " " + b);
}
diff --git a/tests/auto/qml/qqmllanguage/data/OnDestructionType.qml b/tests/auto/qml/qqmllanguage/data/OnDestructionType.qml
index 11fb9d9578..a172d94a9e 100644
--- a/tests/auto/qml/qqmllanguage/data/OnDestructionType.qml
+++ b/tests/auto/qml/qqmllanguage/data/OnDestructionType.qml
@@ -3,6 +3,6 @@ import QtQuick 2.0
MyQmlObject {
property int a: Math.max(10, 9)
- property int b: 11
+ property int b: 11
Component.onDestruction: console.log("Destruction " + a + " " + b);
}
diff --git a/tests/auto/qml/qqmllanguage/data/alias.4.qml b/tests/auto/qml/qqmllanguage/data/alias.4.qml
index bd6a769367..da6c6e7898 100644
--- a/tests/auto/qml/qqmllanguage/data/alias.4.qml
+++ b/tests/auto/qml/qqmllanguage/data/alias.4.qml
@@ -1,6 +1,6 @@
import Test 1.0
Alias2 {
- enumAlias: MyTypeObject.EnumVal2
+ enumAlias: MyTypeObject.EnumVal2
}
diff --git a/tests/auto/qml/qqmllanguage/data/alias.5.qml b/tests/auto/qml/qqmllanguage/data/alias.5.qml
index cee2a88cf7..ccd47658e0 100644
--- a/tests/auto/qml/qqmllanguage/data/alias.5.qml
+++ b/tests/auto/qml/qqmllanguage/data/alias.5.qml
@@ -4,7 +4,7 @@ import Test 1.0
QtObject {
property alias otherAlias: otherObject
- property variant other
+ property variant other
other: MyQmlObject {
id: otherObject
value: 10
diff --git a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml
index 4d54bc83c1..c91cf581b3 100644
--- a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml
+++ b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml
@@ -15,7 +15,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/qqmllanguage/data/defaultPropertyListOrder.qml b/tests/auto/qml/qqmllanguage/data/defaultPropertyListOrder.qml
index 31d17fd55f..fc878170cf 100644
--- a/tests/auto/qml/qqmllanguage/data/defaultPropertyListOrder.qml
+++ b/tests/auto/qml/qqmllanguage/data/defaultPropertyListOrder.qml
@@ -13,10 +13,10 @@ MyContainer {
children: [
QtObject {
property int index: 2
- },
+ },
QtObject {
property int index: 3
- }
+ }
]
QtObject {
diff --git a/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.2.qml b/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.2.qml
index 6f822ba157..319e1f5bc5 100644
--- a/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.2.qml
+++ b/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.2.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.0
import QtQuick 2.0 as Qt47
Qt.QtObject {
diff --git a/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.qml b/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.qml
index 5d072b160a..d4c77f1432 100644
--- a/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.qml
+++ b/tests/auto/qml/qqmllanguage/data/dynamicObjectProperties.qml
@@ -8,6 +8,6 @@ QtObject {
objectProperty2: QtObject {}
property MyComponent myComponentProperty
- property MyComponent myComponentProperty2
+ property MyComponent myComponentProperty2
myComponentProperty2: MyComponent {}
}
diff --git a/tests/auto/qml/qqmllanguage/data/interfaceQList.qml b/tests/auto/qml/qqmllanguage/data/interfaceQList.qml
index c87dfae785..2e968e4fea 100644
--- a/tests/auto/qml/qqmllanguage/data/interfaceQList.qml
+++ b/tests/auto/qml/qqmllanguage/data/interfaceQList.qml
@@ -1,6 +1,6 @@
import Test 1.0
MyContainer {
- qlistInterfaces: [
+ qlistInterfaces: [
MyQmlObject {},
MyQmlObject {}
]
diff --git a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.qml b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.qml
index fa46b8242a..d61dbd76d0 100644
--- a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.qml
+++ b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.0
QtObject {
property variant o;
diff --git a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.2.qml b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.2.qml
index 3e516738d6..23f6c6353b 100644
--- a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.2.qml
+++ b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.2.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.0
QtObject {
property int o;
diff --git a/tests/auto/qml/qqmllanguage/data/nonexistantProperty.3.qml b/tests/auto/qml/qqmllanguage/data/nonexistantProperty.3.qml
index 5b08608862..b1610f7b4f 100644
--- a/tests/auto/qml/qqmllanguage/data/nonexistantProperty.3.qml
+++ b/tests/auto/qml/qqmllanguage/data/nonexistantProperty.3.qml
@@ -1,4 +1,4 @@
import Test 1.0
-MyQmlObject {
- something: 1 + 1
+MyQmlObject {
+ something: 1 + 1
}
diff --git a/tests/auto/qml/qqmllanguage/data/onCompleted.qml b/tests/auto/qml/qqmllanguage/data/onCompleted.qml
index 89e6777f8a..6de38d7aab 100644
--- a/tests/auto/qml/qqmllanguage/data/onCompleted.qml
+++ b/tests/auto/qml/qqmllanguage/data/onCompleted.qml
@@ -10,7 +10,7 @@ MyTypeObject {
objectProperty: OnCompletedType {
qmlobjectProperty: MyQmlObject {
id: nestedObject
- property int b: 10
+ property int b: 10
Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
}
}
diff --git a/tests/auto/qml/qqmllanguage/data/onDestruction.qml b/tests/auto/qml/qqmllanguage/data/onDestruction.qml
index 7d6da260b4..4eb5771943 100644
--- a/tests/auto/qml/qqmllanguage/data/onDestruction.qml
+++ b/tests/auto/qml/qqmllanguage/data/onDestruction.qml
@@ -10,7 +10,7 @@ MyTypeObject {
objectProperty: OnDestructionType {
qmlobjectProperty: MyQmlObject {
id: nestedObject
- property int b: 10
+ property int b: 10
Component.onDestruction: console.log("Destruction " + a + " " + nestedObject.b)
}
}
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index 1b51042eaa..0416258075 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -59,7 +59,7 @@
QVariant myCustomVariantTypeConverter(const QString &data);
-class MyInterface
+class MyInterface
{
public:
MyInterface() : id(913) {}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 6a577ec91c..6110e4870f 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -487,11 +487,11 @@ void tst_qqmllanguage::errors_data()
QTest::newRow("notAvailable") << "notAvailable.qml" << "notAvailable.errors.txt" << false;
QTest::newRow("singularProperty") << "singularProperty.qml" << "singularProperty.errors.txt" << false;
QTest::newRow("singularProperty.2") << "singularProperty.2.qml" << "singularProperty.2.errors.txt" << false;
- QTest::newRow("incorrectCase") << "incorrectCase.qml"
+ QTest::newRow("incorrectCase") << "incorrectCase.qml"
#if defined(Q_OS_MAC) || defined(Q_OS_WIN32)
- << "incorrectCase.errors.insensitive.txt"
+ << "incorrectCase.errors.insensitive.txt"
#else
- << "incorrectCase.errors.sensitive.txt"
+ << "incorrectCase.errors.sensitive.txt"
#endif
<< false;
@@ -612,7 +612,7 @@ void tst_qqmllanguage::assignQmlComponent()
QCOMPARE(child->property("y"), QVariant(11));
}
-// Test literal assignment to all the basic types
+// Test literal assignment to all the basic types
void tst_qqmllanguage::assignBasicTypes()
{
QQmlComponent component(&engine, testFileUrl("assignBasicTypes.qml"));
@@ -1170,7 +1170,7 @@ void tst_qqmllanguage::idProperty()
MyContainer *object = qobject_cast<MyContainer *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->getChildren()->count(), 1);
- MyTypeObject *child =
+ MyTypeObject *child =
qobject_cast<MyTypeObject *>(object->getChildren()->at(0));
QVERIFY(child != 0);
QCOMPARE(child->id(), QString("myObjectId"));
@@ -1361,12 +1361,12 @@ void tst_qqmllanguage::propertyValueSource()
QList<QObject *> valueSources;
QObjectList allChildren = object->findChildren<QObject*>();
foreach (QObject *child, allChildren) {
- if (qobject_cast<QQmlPropertyValueSource *>(child))
+ if (qobject_cast<QQmlPropertyValueSource *>(child))
valueSources.append(child);
}
QCOMPARE(valueSources.count(), 1);
- MyPropertyValueSource *valueSource =
+ MyPropertyValueSource *valueSource =
qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
QVERIFY(valueSource != 0);
QCOMPARE(valueSource->prop.object(), qobject_cast<QObject*>(object));
@@ -1382,12 +1382,12 @@ void tst_qqmllanguage::propertyValueSource()
QList<QObject *> valueSources;
QObjectList allChildren = object->findChildren<QObject*>();
foreach (QObject *child, allChildren) {
- if (qobject_cast<QQmlPropertyValueSource *>(child))
+ if (qobject_cast<QQmlPropertyValueSource *>(child))
valueSources.append(child);
}
QCOMPARE(valueSources.count(), 1);
- MyPropertyValueSource *valueSource =
+ MyPropertyValueSource *valueSource =
qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
QVERIFY(valueSource != 0);
QCOMPARE(valueSource->prop.object(), qobject_cast<QObject*>(object));
@@ -1510,7 +1510,7 @@ void tst_qqmllanguage::aliasProperties()
QVERIFY(object != 0);
// Read through alias
- MyQmlObject *v =
+ MyQmlObject *v =
qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
QVERIFY(v != 0);
QCOMPARE(v->value(), 10);
@@ -1519,7 +1519,7 @@ void tst_qqmllanguage::aliasProperties()
MyQmlObject *v2 = new MyQmlObject();
v2->setParent(object);
object->setProperty("aliasObject", qVariantFromValue(v2));
- MyQmlObject *v3 =
+ MyQmlObject *v3 =
qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
QVERIFY(v3 != 0);
QCOMPARE(v3, v2);
@@ -1592,7 +1592,7 @@ void tst_qqmllanguage::aliasProperties()
QCOMPARE(object->property("a").toInt(), 1923);
}
- // Ptr Alias Cleanup - check that aliases to ptr types return 0
+ // Ptr Alias Cleanup - check that aliases to ptr types return 0
// if the object aliased to is removed
{
QQmlComponent component(&engine, testFileUrl("alias.7.qml"));
@@ -1846,7 +1846,7 @@ void tst_qqmllanguage::scriptString()
}
}
-// Check that default property assignments are correctly spliced into explicit
+// Check that default property assignments are correctly spliced into explicit
// property assignments
void tst_qqmllanguage::defaultPropertyListOrder()
{
@@ -2993,7 +2993,7 @@ void tst_qqmllanguage::remoteLoadCrash()
QQmlComponent component(&engine);
component.setData("import QtQuick 2.0; Text {}", QUrl("http://127.0.0.1:14448/remoteLoadCrash.qml"));
- while (component.isLoading())
+ while (component.isLoading())
QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::WaitForMoreEvents, 50);
QObject *o = component.create();
diff --git a/tests/auto/qml/qqmllistmodel/data/multipleroles.qml b/tests/auto/qml/qqmllistmodel/data/multipleroles.qml
index 4a331e2b3e..cd4f1aca40 100644
--- a/tests/auto/qml/qqmllistmodel/data/multipleroles.qml
+++ b/tests/auto/qml/qqmllistmodel/data/multipleroles.qml
@@ -2,12 +2,12 @@ import QtQuick 2.0
ListView {
width: 100
height: 250
- delegate: Rectangle {
+ delegate: Rectangle {
width: 100
height: 50
- color: black ? "black": "white"
+ color: black ? "black": "white"
}
- model: ListModel {
+ model: ListModel {
objectName: "listModel"
ListElement {
black: false
diff --git a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
index 90023222d3..2c57129657 100644
--- a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
+++ b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
@@ -139,7 +139,7 @@ void tst_qqmlmetatype::qmlParserStatusCast()
QCOMPARE(QQmlMetaType::qmlType(qMetaTypeId<TestType *>())->parserStatusCast(), -1);
QVERIFY(QQmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
QCOMPARE(QQmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->parserStatusCast(), -1);
-
+
QVERIFY(QQmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
int cast = QQmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->parserStatusCast();
QVERIFY(cast != -1);
@@ -159,7 +159,7 @@ void tst_qqmlmetatype::qmlPropertyValueSourceCast()
QCOMPARE(QQmlMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueSourceCast(), -1);
QVERIFY(QQmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
QCOMPARE(QQmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueSourceCast(), -1);
-
+
QVERIFY(QQmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
int cast = QQmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->propertyValueSourceCast();
QVERIFY(cast != -1);
@@ -179,7 +179,7 @@ void tst_qqmlmetatype::qmlPropertyValueInterceptorCast()
QCOMPARE(QQmlMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueInterceptorCast(), -1);
QVERIFY(QQmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
QCOMPARE(QQmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueInterceptorCast(), -1);
-
+
QVERIFY(QQmlMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>()) != 0);
int cast = QQmlMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>())->propertyValueInterceptorCast();
QVERIFY(cast != -1);
diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml
index 97732d35d8..b13b2004c2 100644
--- a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml
+++ b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml
@@ -5,7 +5,7 @@ Item {
property bool test: false
property bool test2: false
- Bar {
+ Bar {
id: bar
}
diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml
index f09c29b5a8..563c0b28e3 100644
--- a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml
+++ b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml
@@ -3,7 +3,7 @@ import QtQuick 2.0
Item {
property bool test: false
- Bar {
+ Bar {
id: bar
}
diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
index a6d9fb5601..04c7e51e4f 100644
--- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
@@ -145,7 +145,7 @@ void tst_qqmlmoduleplugin::importsPlugin()
QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestQmlPluginType' does not contain a module identifier directive - it cannot be protected from external registrations.");
QQmlComponent component(&engine, testFileUrl(QStringLiteral("works.qml")));
foreach (QQmlError err, component.errors())
- qWarning() << err;
+ qWarning() << err;
VERIFY_ERRORS(0);
QObject *object = component.create();
QVERIFY(object != 0);
diff --git a/tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml b/tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml
index 923922c55a..78d3bc0fbd 100644
--- a/tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml
+++ b/tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml
@@ -10,7 +10,7 @@ Rectangle {
property int myPixelSize: 12
property int myPixelSize2: 24
-
+
Text {
id: other
font.pixelSize: 6
diff --git a/tests/auto/qml/qqmlvaluetypes/data/conflicting.2.qml b/tests/auto/qml/qqmlvaluetypes/data/conflicting.2.qml
index 9804af4df6..725ba50a45 100644
--- a/tests/auto/qml/qqmlvaluetypes/data/conflicting.2.qml
+++ b/tests/auto/qml/qqmlvaluetypes/data/conflicting.2.qml
@@ -10,7 +10,7 @@ Rectangle {
property int myPixelSize: 12
property int myPixelSize2: 24
-
+
Text {
id: other
font.pixelSize: 6
diff --git a/tests/auto/qml/qqmlvaluetypes/data/conflicting.3.qml b/tests/auto/qml/qqmlvaluetypes/data/conflicting.3.qml
index b5bb7f8ccc..509fb39562 100644
--- a/tests/auto/qml/qqmlvaluetypes/data/conflicting.3.qml
+++ b/tests/auto/qml/qqmlvaluetypes/data/conflicting.3.qml
@@ -10,7 +10,7 @@ Rectangle {
property int myPixelSize: 12
property int myPixelSize2: 24
-
+
Text {
id: other
font.pixelSize: 6
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml
index d5bb84ddc0..7fcbc9367a 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml
@@ -15,7 +15,7 @@ QtObject {
Component.onCompleted: {
var x = new XMLHttpRequest;
- x.abort();
+ x.abort();
if (x.readyState == XMLHttpRequest.UNSENT)
readyState = true;
@@ -23,7 +23,7 @@ QtObject {
x.open("PUT", url);
x.setRequestHeader("Accept-Language", "en-US");
- x.abort();
+ x.abort();
x.open("GET", url);
x.setRequestHeader("Accept-Language", "en-US");
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml
index 4f58062a26..0a85c6b16f 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml
@@ -15,7 +15,7 @@ QtObject {
Component.onCompleted: {
var x = new XMLHttpRequest;
- x.abort();
+ x.abort();
if (x.readyState == XMLHttpRequest.UNSENT)
readyState = true;
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/element.qml b/tests/auto/qml/qqmlxmlhttprequest/data/element.qml
index 9b190f3a43..e0701d511a 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/element.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/element.qml
@@ -115,8 +115,8 @@ QtObject {
function checkXML(document)
{
- checkElement(document.documentElement,
- document.documentElement.childNodes[0],
+ checkElement(document.documentElement,
+ document.documentElement.childNodes[0],
document.documentElement.childNodes[1]);
}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml
index 580688b835..a9066093d4 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml
@@ -20,12 +20,12 @@ QtObject {
Component.onCompleted: {
var x = new XMLHttpRequest;
- try {
- x.getResponseHeader("Test-Header");
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- unsentException = true;
- }
+ try {
+ x.getResponseHeader("Test-Header");
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ unsentException = true;
+ }
if (x.readyState == XMLHttpRequest.UNSENT)
readyState = true;
@@ -36,25 +36,25 @@ QtObject {
if (x.readyState == XMLHttpRequest.OPENED)
openedState = true;
- try {
- x.getResponseHeader("Test-Header");
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- openedException = true;
- }
+ try {
+ x.getResponseHeader("Test-Header");
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ openedException = true;
+ }
var headers = "connection: close\r\ncontent-type: text/html; charset=UTF-8\r\ntest-header: TestValue\r\nmultitest-header: TestValue, SecondTestValue\r\ncontent-length: 11";
// Test to the end
x.onreadystatechange = function() {
- if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
- headersReceivedState = true;
+ if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+ headersReceivedState = true;
- headersReceivedHeader = (x.getAllResponseHeaders() == headers);
- } else if (x.readyState == XMLHttpRequest.DONE) {
- doneState = headersReceivedState && true;
+ headersReceivedHeader = (x.getAllResponseHeaders() == headers);
+ } else if (x.readyState == XMLHttpRequest.DONE) {
+ doneState = headersReceivedState && true;
- doneHeader = (x.getAllResponseHeaders() == headers);
+ doneHeader = (x.getAllResponseHeaders() == headers);
dataOK = (x.responseText == "QML Rocks!\n");
}
}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml
index 203967e539..0219d7b2fc 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml
@@ -26,12 +26,12 @@ QtObject {
Component.onCompleted: {
var x = new XMLHttpRequest;
- try {
- x.getResponseHeader("Test-Header");
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- unsentException = true;
- }
+ try {
+ x.getResponseHeader("Test-Header");
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ unsentException = true;
+ }
if (x.readyState == XMLHttpRequest.UNSENT)
readyState = true;
@@ -42,29 +42,29 @@ QtObject {
if (x.readyState == XMLHttpRequest.OPENED)
openedState = true;
- try {
- x.getResponseHeader("Test-Header");
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- openedException = true;
- }
+ try {
+ x.getResponseHeader("Test-Header");
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ openedException = true;
+ }
// Test to the end
x.onreadystatechange = function() {
- if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
- headersReceivedState = true;
-
- headersReceivedNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
- headersReceivedValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
- headersReceivedMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
- headersReceivedCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
- } else if (x.readyState == XMLHttpRequest.DONE) {
- doneState = headersReceivedState && true;
-
- doneNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
- doneValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
- doneMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
- doneCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
+ if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+ headersReceivedState = true;
+
+ headersReceivedNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
+ headersReceivedValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
+ headersReceivedMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
+ headersReceivedCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
+ } else if (x.readyState == XMLHttpRequest.DONE) {
+ doneState = headersReceivedState && true;
+
+ doneNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
+ doneValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
+ doneMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
+ doneCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
dataOK = (x.responseText == "QML Rocks!\n");
}
}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml
index 5a4093b9f1..88207c19ca 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.0
QtObject {
property bool readyState: false
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml b/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml
index e5c7b74553..5b01caad39 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml
@@ -5,7 +5,7 @@ QtObject {
property bool dataOK: false
property bool done: false
-
+
Component.onCompleted: {
var x = new XMLHttpRequest;
x.open("GET", url);
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml b/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml
index 0894573ecc..cd6e1f99ad 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml
@@ -5,7 +5,7 @@ QtObject {
property bool dataOK: false
property bool done: false
-
+
Component.onCompleted: {
var x = new XMLHttpRequest;
x.open("GET", url);
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml b/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml
index 003d1954e9..c658feb5aa 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml
@@ -5,7 +5,7 @@ QtObject {
property bool dataOK: false
property bool done: false
-
+
Component.onCompleted: {
var x = new XMLHttpRequest;
x.open("GET", url);
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml
index 4e0caa7171..65ce90853d 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml
@@ -19,7 +19,7 @@ QtObject {
x.send();
try {
- x.send()
+ x.send()
} catch (e) {
if (e.code == DOMException.INVALID_STATE_ERR)
test = true;
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/status.qml b/tests/auto/qml/qqmlxmlhttprequest/data/status.qml
index 5feac17711..22c45c099d 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/status.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/status.qml
@@ -19,22 +19,22 @@ QtObject {
Component.onCompleted: {
var x = new XMLHttpRequest;
- try {
- var a = x.status;
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- unsentException = true;
- }
+ try {
+ var a = x.status;
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ unsentException = true;
+ }
x.open("GET", url);
x.setRequestHeader("Accept-Language", "en-US");
- try {
- var a = x.status;
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- openedException = true;
- }
+ try {
+ var a = x.status;
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ openedException = true;
+ }
// Test to the end
x.onreadystatechange = function() {
@@ -65,11 +65,11 @@ QtObject {
x.send()
- try {
- var a = x.status;
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- sentException = true;
- }
+ try {
+ var a = x.status;
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ sentException = true;
+ }
}
}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml b/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml
index 3c74efc091..bf59a1e9f9 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml
@@ -19,22 +19,22 @@ QtObject {
Component.onCompleted: {
var x = new XMLHttpRequest;
- try {
- var a = x.statusText;
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- unsentException = true;
- }
+ try {
+ var a = x.statusText;
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ unsentException = true;
+ }
x.open("GET", url);
x.setRequestHeader("Accept-Language", "en-US");
- try {
- var a = x.statusText;
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- openedException = true;
- }
+ try {
+ var a = x.statusText;
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ openedException = true;
+ }
// Test to the end
x.onreadystatechange = function() {
@@ -65,11 +65,11 @@ QtObject {
x.send()
- try {
- var a = x.statusText;
- } catch (e) {
- if (e.code == DOMException.INVALID_STATE_ERR)
- sentException = true;
- }
+ try {
+ var a = x.statusText;
+ } catch (e) {
+ if (e.code == DOMException.INVALID_STATE_ERR)
+ sentException = true;
+ }
}
}
diff --git a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
index 9c67e6e2e9..17becb3714 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
+++ b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
@@ -208,7 +208,7 @@ void tst_qqmlxmlhttprequest::instanceStateValues()
QCOMPARE(object->property("done").toInt(), 4);
}
-// Test calling constructor
+// Test calling constructor
void tst_qqmlxmlhttprequest::constructor()
{
QQmlComponent component(&engine, testFileUrl("constructor.qml"));
@@ -436,7 +436,7 @@ void tst_qqmlxmlhttprequest::setRequestHeader_sent()
component.completeCreate();
QCOMPARE(object->property("test").toBool(), true);
-
+
QTRY_VERIFY(object->property("dataOK").toBool() == true);
}
@@ -796,7 +796,7 @@ void tst_qqmlxmlhttprequest::statusText()
TestHTTPServer server(SERVER_PORT);
QVERIFY(server.isValid());
QVERIFY(server.wait(testFileUrl("status.expect"),
- replyUrl,
+ replyUrl,
testFileUrl("testdocument.html")));
QQmlComponent component(&engine, testFileUrl("statusText.qml"));
@@ -836,7 +836,7 @@ void tst_qqmlxmlhttprequest::responseText()
TestHTTPServer server(SERVER_PORT);
QVERIFY(server.isValid());
QVERIFY(server.wait(testFileUrl("status.expect"),
- replyUrl,
+ replyUrl,
bodyUrl));
QQmlComponent component(&engine, testFileUrl("responseText.qml"));
@@ -883,7 +883,7 @@ void tst_qqmlxmlhttprequest::nonUtf8()
QMetaObject::invokeMethod(object.data(), "startRequest");
QTRY_VERIFY(object->property("dataOK").toBool() == true);
-
+
QCOMPARE(object->property("responseText").toString(), responseText);
if (!xmlRootNodeValue.isEmpty()) {
@@ -980,10 +980,10 @@ void tst_qqmlxmlhttprequest::redirects()
object->setProperty("expectedText", "");
component.completeCreate();
- for (int ii = 0; ii < 60; ++ii) {
- if (object->property("done").toBool()) break;
- QTest::qWait(50);
- }
+ for (int ii = 0; ii < 60; ++ii) {
+ if (object->property("done").toBool()) break;
+ QTest::qWait(50);
+ }
QVERIFY(object->property("done").toBool() == true);
QCOMPARE(object->property("dataOK").toBool(), true);
diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
index 53df72d75f..73e8a283c7 100644
--- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
+++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
@@ -137,8 +137,8 @@ void tst_qquickfolderlistmodel::basicProperties()
QCOMPARE(flm->property("showDotAndDotDot").toBool(), false);
QCOMPARE(flm->property("showOnlyReadable").toBool(), false);
QCOMPARE(flm->data(flm->index(0),FileNameRole).toString(), QLatin1String("basic.qml"));
- QCOMPARE(flm->data(flm->index(1),FileNameRole).toString(), QLatin1String("dummy.qml"));
-
+ QCOMPARE(flm->data(flm->index(1),FileNameRole).toString(), QLatin1String("dummy.qml"));
+
flm->setProperty("folder",QUrl::fromLocalFile(""));
QCOMPARE(flm->property("folder").toUrl(), QUrl::fromLocalFile(""));
}
diff --git a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
index 1530ce83e2..a799fc4fc4 100644
--- a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
+++ b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
@@ -187,7 +187,7 @@ void tst_QQuickWorkerScript::messaging_sendJsObject()
waitForEchoMessage(worker);
QVariant result = qVariantFromValue(false);
- QVERIFY(QMetaObject::invokeMethod(worker, "compareLiteralResponse", Qt::DirectConnection,
+ QVERIFY(QMetaObject::invokeMethod(worker, "compareLiteralResponse", Qt::DirectConnection,
Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, jsObject)));
QVERIFY(result.toBool());
diff --git a/tests/auto/quick/qquickanimations/data/runningTrueBug.qml b/tests/auto/quick/qquickanimations/data/runningTrueBug.qml
index bec6fab368..b2e8afcf0f 100644
--- a/tests/auto/quick/qquickanimations/data/runningTrueBug.qml
+++ b/tests/auto/quick/qquickanimations/data/runningTrueBug.qml
@@ -26,5 +26,5 @@ Rectangle {
duration: 1000
}
}
- }
+ }
}
diff --git a/tests/auto/quick/qquickgridview/data/gridview-enforcerange.qml b/tests/auto/quick/qquickgridview/data/gridview-enforcerange.qml
index 2bfe7da78e..d1f8c31e1d 100644
--- a/tests/auto/quick/qquickgridview/data/gridview-enforcerange.qml
+++ b/tests/auto/quick/qquickgridview/data/gridview-enforcerange.qml
@@ -39,7 +39,7 @@ Rectangle {
color: "lightsteelblue"
}
}
-
+
GridView {
id: grid
objectName: "grid"
diff --git a/tests/auto/quick/qquickgridview/data/propertychangestest.qml b/tests/auto/quick/qquickgridview/data/propertychangestest.qml
index 97efbe78f5..af3126f2d4 100644
--- a/tests/auto/quick/qquickgridview/data/propertychangestest.qml
+++ b/tests/auto/quick/qquickgridview/data/propertychangestest.qml
@@ -6,7 +6,7 @@ Rectangle {
id: delegate
Item {
id: wrapper
- width: 180; height: 40;
+ width: 180; height: 40;
Column {
x: 5; y: 5
Text { text: '<b>Name:</b> ' + name }
@@ -36,7 +36,7 @@ Rectangle {
flow: GridView.LeftToRight
}
- data:[
+ data:[
ListModel {
id: listModel
ListElement {
@@ -65,5 +65,5 @@ Rectangle {
}
]
}
-
-
+
+
diff --git a/tests/auto/quick/qquickimage/data/aspectratio.qml b/tests/auto/quick/qquickimage/data/aspectratio.qml
index b26f0e1f04..a04a09d64e 100644
--- a/tests/auto/quick/qquickimage/data/aspectratio.qml
+++ b/tests/auto/quick/qquickimage/data/aspectratio.qml
@@ -1,6 +1,6 @@
import QtQuick 2.0
-Image {
+Image {
source: "heart.png"
fillMode: Image.PreserveAspectFit;
}
diff --git a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
index 3eea3c955c..48af48b17b 100644
--- a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
+++ b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
@@ -105,10 +105,10 @@ public:
if (id == QLatin1String("no-such-file.png"))
return QImage();
- int width = 100;
+ int width = 100;
int height = 100;
QImage image(width, height, QImage::Format_RGB32);
- if (size)
+ if (size)
*size = QSize(width, height);
if (requestedSize.isValid())
image = image.scaled(requestedSize);
@@ -142,10 +142,10 @@ public:
if (id == QLatin1String("no-such-file.png"))
return QPixmap();
- int width = 100;
+ int width = 100;
int height = 100;
QPixmap image(width, height);
- if (size)
+ if (size)
*size = QSize(width, height);
if (requestedSize.isValid())
image = image.scaled(requestedSize);
@@ -161,7 +161,7 @@ Q_DECLARE_METATYPE(TestQPixmapProvider*);
QString tst_qquickimageprovider::newImageFileName() const
{
// need to generate new filenames each time or else images are loaded
- // from cache and we won't get loading status changes when testing
+ // from cache and we won't get loading status changes when testing
// async loading
static int count = 0;
return QString("image://test/image-%1.png").arg(count++);
@@ -229,7 +229,7 @@ void tst_qquickimageprovider::runTest(bool async, QQuickImageProvider *provider)
engine.addImageProvider("test", provider);
QVERIFY(engine.imageProvider("test") != 0);
- QString componentStr = "import QtQuick 2.0\nImage { source: \"" + source + "\"; "
+ QString componentStr = "import QtQuick 2.0\nImage { source: \"" + source + "\"; "
+ (async ? "asynchronous: true; " : "")
+ properties + " }";
QQmlComponent component(&engine);
diff --git a/tests/auto/quick/qquickitem2/data/childrenRectBug3.qml b/tests/auto/quick/qquickitem2/data/childrenRectBug3.qml
index 518e76509e..25d6a526d2 100644
--- a/tests/auto/quick/qquickitem2/data/childrenRectBug3.qml
+++ b/tests/auto/quick/qquickitem2/data/childrenRectBug3.qml
@@ -9,7 +9,7 @@ Rectangle {
Repeater {
model: 1
- Rectangle { }
+ Rectangle { }
}
}
}
diff --git a/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml b/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml
index 4ccf3088b0..3d3885a5ca 100644
--- a/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml
@@ -39,7 +39,7 @@ Rectangle {
color: "lightsteelblue"
}
}
-
+
ListView {
id: list
objectName: "list"
diff --git a/tests/auto/quick/qquicklistview/data/propertychangestest.qml b/tests/auto/quick/qquicklistview/data/propertychangestest.qml
index 146f3f13b0..f269b4ab92 100644
--- a/tests/auto/quick/qquicklistview/data/propertychangestest.qml
+++ b/tests/auto/quick/qquicklistview/data/propertychangestest.qml
@@ -6,7 +6,7 @@ Rectangle {
id: delegate
Item {
id: wrapper
- width: 180; height: 40;
+ width: 180; height: 40;
Column {
x: 5; y: 5
Text { text: '<b>Name:</b> ' + name }
@@ -38,7 +38,7 @@ Rectangle {
snapMode: ListView.SnapToItem
}
- data:[
+ data:[
ListModel {
id: listModel
ListElement {
@@ -67,5 +67,5 @@ Rectangle {
}
]
}
-
-
+
+
diff --git a/tests/auto/quick/qquicklistview/incrementalmodel.cpp b/tests/auto/quick/qquicklistview/incrementalmodel.cpp
index 473d52eb28..3d4b716e6b 100644
--- a/tests/auto/quick/qquicklistview/incrementalmodel.cpp
+++ b/tests/auto/quick/qquicklistview/incrementalmodel.cpp
@@ -59,10 +59,10 @@ QVariant IncrementalModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid())
return QVariant();
-
+
if (index.row() >= list.size() || index.row() < 0)
return QVariant();
-
+
if (role == Qt::DisplayRole)
return list.at(index.row());
return QVariant();
@@ -82,7 +82,7 @@ void IncrementalModel::fetchMore(const QModelIndex & /* index */)
int itemsToFetch = qMin(5, remainder);
beginInsertRows(QModelIndex(), count, count+itemsToFetch-1);
-
+
count += itemsToFetch;
endInsertRows();
diff --git a/tests/auto/quick/qquickmousearea/data/dragproperties.qml b/tests/auto/quick/qquickmousearea/data/dragproperties.qml
index d8d7b3bb6e..4e0dbe6277 100644
--- a/tests/auto/quick/qquickmousearea/data/dragproperties.qml
+++ b/tests/auto/quick/qquickmousearea/data/dragproperties.qml
@@ -1,7 +1,7 @@
import QtQuick 2.0
Rectangle {
id: whiteRect
- width: 200
+ width: 200
height: 200
color: "white"
Rectangle {
diff --git a/tests/auto/quick/qquickmousearea/data/dragreset.qml b/tests/auto/quick/qquickmousearea/data/dragreset.qml
index 3259dcf87d..10039f1fcb 100644
--- a/tests/auto/quick/qquickmousearea/data/dragreset.qml
+++ b/tests/auto/quick/qquickmousearea/data/dragreset.qml
@@ -1,7 +1,7 @@
import QtQuick 2.0
Rectangle {
id: whiteRect
- width: 200
+ width: 200
height: 200
color: "white"
Rectangle {
diff --git a/tests/auto/quick/qquickpathview/data/propertychanges.qml b/tests/auto/quick/qquickpathview/data/propertychanges.qml
index 09b309f86f..17d24f6606 100644
--- a/tests/auto/quick/qquickpathview/data/propertychanges.qml
+++ b/tests/auto/quick/qquickpathview/data/propertychanges.qml
@@ -6,7 +6,7 @@ Rectangle {
id: myDelegate
Item {
id: wrapper
- width: 180; height: 40;
+ width: 180; height: 40;
opacity: PathView.opacity
Column {
x: 5; y: 5
@@ -46,7 +46,7 @@ Rectangle {
}
}
- data:[
+ data:[
ListModel {
id: listModel
ListElement {
diff --git a/tests/auto/quick/qquickrepeater/data/properties.qml b/tests/auto/quick/qquickrepeater/data/properties.qml
index 035431c784..18d014f96d 100644
--- a/tests/auto/quick/qquickrepeater/data/properties.qml
+++ b/tests/auto/quick/qquickrepeater/data/properties.qml
@@ -1,11 +1,11 @@
import QtQuick 2.0
-Row {
- Repeater {
+Row {
+ Repeater {
objectName: "repeater"
model: 5
- Text {
- text: "I'm item " + index
- }
+ Text {
+ text: "I'm item " + index
+ }
}
}
diff --git a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
index 4e9ceba2a2..a2e05ba883 100644
--- a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
+++ b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
@@ -86,7 +86,7 @@ const QChar tst_qquickstyledtext::disc(0x25e6);
const QChar tst_qquickstyledtext::square(0x25a1);
// For malformed input all we test is that we get the expected text and format out.
-//
+//
void tst_qquickstyledtext::textOutput_data()
{
QTest::addColumn<QString>("input");
diff --git a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTest.qml b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTest.qml
index 043304d027..5deffe7d11 100644
--- a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTest.qml
+++ b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTest.qml
@@ -1,12 +1,12 @@
import QtQuick 2.0
Rectangle { width: 300; height: 300; color: "white"
- resources: [
+ resources: [
Component { id:cursorFail; FailItem { objectName: "delegateFail" } },
Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } },
Component { id:cursorErr; ErrItem { objectName: "delegateErrorA" } }
- ]
+ ]
TextEdit {
cursorDelegate: cursorFail
cursorVisible: true
diff --git a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail1.qml
index a6556454fe..bff8ae435b 100644
--- a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail1.qml
+++ b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail1.qml
@@ -1,11 +1,11 @@
import QtQuick 2.0
Rectangle { width: 300; height: 300; color: "white"
- resources: [
+ resources: [
Component { id:cursorFail; FailItem { objectName: "delegateFail" } },
Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } }
- ]
+ ]
TextEdit {
cursorDelegate: cursorFail
cursorVisible: true
diff --git a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail2.qml
index 9429779a87..1cf1ed47f2 100644
--- a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail2.qml
+++ b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestFail2.qml
@@ -1,11 +1,11 @@
import QtQuick 2.0
Rectangle { width: 300; height: 300; color: "white"
- resources: [
+ resources: [
Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } },
Component { id:cursorErr; ErrItem { objectName: "delegateErrorA" } }
- ]
+ ]
TextEdit {
cursorDelegate: cursorWait
cursorVisible: true
diff --git a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestPass.qml b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestPass.qml
index 69e498ef8d..d97a9a609a 100644
--- a/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestPass.qml
+++ b/tests/auto/quick/qquicktextedit/data/http/cursorHttpTestPass.qml
@@ -1,10 +1,10 @@
import QtQuick 2.0
Rectangle { width: 300; height: 300; color: "white"
- resources: [
+ resources: [
Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } }
- ]
+ ]
TextEdit {
cursorDelegate: cursorWait
text: "Hello"
diff --git a/tests/auto/quick/qquicktextedit/data/inputmethodhints.qml b/tests/auto/quick/qquicktextedit/data/inputmethodhints.qml
index dec3b978e7..5ec99198a4 100644
--- a/tests/auto/quick/qquicktextedit/data/inputmethodhints.qml
+++ b/tests/auto/quick/qquicktextedit/data/inputmethodhints.qml
@@ -1,6 +1,6 @@
import QtQuick 2.0
-TextEdit {
+TextEdit {
text: "Hello world!"
inputMethodHints: Qt.ImhNoPredictiveText
}
diff --git a/tests/auto/quick/qquicktextedit/data/navigation.qml b/tests/auto/quick/qquicktextedit/data/navigation.qml
index 0201c62b3c..7604c96adf 100644
--- a/tests/auto/quick/qquicktextedit/data/navigation.qml
+++ b/tests/auto/quick/qquicktextedit/data/navigation.qml
@@ -5,7 +5,7 @@ Rectangle {
width: 800; height: 600; color: "blue"
- Item {
+ Item {
id: firstItem;
KeyNavigation.right: input
}
@@ -18,7 +18,7 @@ Rectangle {
text: "a"
}
Item {
- id: lastItem
+ id: lastItem
KeyNavigation.left: input
}
}
diff --git a/tests/auto/quick/qquicktextinput/data/navigation.qml b/tests/auto/quick/qquicktextinput/data/navigation.qml
index 3a7d07b3c7..8df0d151a7 100644
--- a/tests/auto/quick/qquicktextinput/data/navigation.qml
+++ b/tests/auto/quick/qquicktextinput/data/navigation.qml
@@ -5,7 +5,7 @@ Rectangle {
width: 800; height: 600; color: "blue"
- Item {
+ Item {
id: firstItem;
KeyNavigation.right: input
}
@@ -18,7 +18,7 @@ Rectangle {
KeyNavigation.down: lastItem
}
Item {
- id: lastItem
+ id: lastItem
KeyNavigation.left: input
}
}
diff --git a/tests/auto/quick/qquicktextinput/data/validators.qml b/tests/auto/quick/qquicktextinput/data/validators.qml
index 0ba87e0592..b923f69801 100644
--- a/tests/auto/quick/qquicktextinput/data/validators.qml
+++ b/tests/auto/quick/qquicktextinput/data/validators.qml
@@ -25,5 +25,5 @@ Item {
property bool acceptable: acceptableInput
}
}
-
+
}
diff --git a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp
index 12ae3c273f..a3cfa0011a 100644
--- a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp
+++ b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp
@@ -744,9 +744,9 @@ void tst_qquickxmllistmodel::noKeysValueChanges()
QQmlComponent component(&engine, testFileUrl("roleKeys.qml"));
QAbstractItemModel *model = qobject_cast<QAbstractItemModel *>(component.create());
QVERIFY(model != 0);
-
+
QString xml;
-
+
xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
model->setProperty("xml",xml);
QTRY_COMPARE(model->rowCount(), 2);
@@ -820,11 +820,11 @@ void tst_qquickxmllistmodel::threading()
QQmlComponent component(&engine, testFileUrl("roleKeys.qml"));
QAbstractItemModel *m1 = qobject_cast<QAbstractItemModel *>(component.create());
- QVERIFY(m1 != 0);
+ QVERIFY(m1 != 0);
QAbstractItemModel *m2 = qobject_cast<QAbstractItemModel *>(component.create());
- QVERIFY(m2 != 0);
+ QVERIFY(m2 != 0);
QAbstractItemModel *m3 = qobject_cast<QAbstractItemModel *>(component.create());
- QVERIFY(m3 != 0);
+ QVERIFY(m3 != 0);
for (int dataCount=0; dataCount<xmlDataCount; dataCount++) {
diff --git a/tests/auto/shared/testhttpserver.cpp b/tests/auto/shared/testhttpserver.cpp
index 20df0c12f5..d3de584084 100644
--- a/tests/auto/shared/testhttpserver.cpp
+++ b/tests/auto/shared/testhttpserver.cpp
@@ -127,7 +127,7 @@ bool TestHTTPServer::wait(const QUrl &expect, const QUrl &reply, const QUrl &bod
QFile expectFile(expect.toLocalFile());
if (!expectFile.open(QIODevice::ReadOnly)) return false;
-
+
QFile replyFile(reply.toLocalFile());
if (!replyFile.open(QIODevice::ReadOnly)) return false;
@@ -325,7 +325,7 @@ void TestHTTPServer::serveGET(QTcpSocket *socket, const QByteArray &data)
QByteArray total = dataCache[socket] + data;
dataCache[socket] = total;
-
+
if (total.contains("\n\r\n")) {
bool close = true;
@@ -342,7 +342,7 @@ void TestHTTPServer::serveGET(QTcpSocket *socket, const QByteArray &data)
}
dataCache.remove(socket);
- if (close)
+ if (close)
socket->disconnectFromHost();
}
}