diff options
Diffstat (limited to 'tests/auto/declarative')
146 files changed, 469 insertions, 469 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index c960b8fd..e9d4a2cc 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -8,7 +8,7 @@ TARGET = tst_examples QT += testlib declarative macx:CONFIG -= app_bundle -SOURCES += tst_examples.cpp +SOURCES += tst_examples.cpp include(../../../../tools/qml/qml.pri) diff --git a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp index b51a72fd..1e9006f8 100644 --- a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp +++ b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp @@ -88,7 +88,7 @@ QStringList tst_moduleqt47::findFiles(const QDir &d) QString absFile = d.absoluteFilePath(file); bool skip = false; - for (int ii = 0; !skip && ii < excludedFiles.count(); ++ii) + for (int ii = 0; !skip && ii < excludedFiles.count(); ++ii) skip = (absFile.endsWith(excludedFiles.at(ii))); if (!skip) @@ -110,7 +110,7 @@ void tst_moduleqt47::accidentalImport_data() QTest::addColumn<QString>("file"); QStringList files = findFiles(QDir(SRCDIR "/../../../../")); - foreach(const QString &file, files) + foreach (const QString &file, files) QTest::newRow(qPrintable(file)) << file; } diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp index 4a9ed70a..26e8675d 100644 --- a/tests/auto/declarative/parserstress/tst_parserstress.cpp +++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp @@ -126,7 +126,7 @@ void tst_parserstress::ecmascript() QByteArray qmlData = qml.toUtf8(); QDeclarativeComponent component(&engine); - + component.setData(qmlData, QUrl::fromLocalFile(SRCDIR + QString("/dummy.qml"))); QFileInfo info(file); diff --git a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml index 7d33ed71..1bc9f25a 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml +++ b/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml @@ -26,5 +26,5 @@ Rectangle { duration: 1000 } } - } + } } diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index 953993ed..da7352e5 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -5,7 +5,7 @@ QT += testlib declarative QT += script network widgets macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativecomponent.cpp +SOURCES += tst_qdeclarativecomponent.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp index 57d5f545..bc46a2df 100644 --- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp +++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp @@ -235,7 +235,7 @@ private: QCOMPARE(obj->property("test"), value); \ \ delete obj; \ -} +} void tst_qdeclarativecontext::setContextProperty() { @@ -277,56 +277,56 @@ void tst_qdeclarativecontext::setContextProperty() // Changes in context properties { - QDeclarativeComponent component(&engine); + QDeclarativeComponent component(&engine); component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl()); - QObject *obj = component.create(&ctxt2); + QObject *obj = component.create(&ctxt2); - QCOMPARE(obj->property("test"), QVariant(13)); + QCOMPARE(obj->property("test"), QVariant(13)); ctxt.setContextProperty("a", QVariant(19)); - QCOMPARE(obj->property("test"), QVariant(19)); + QCOMPARE(obj->property("test"), QVariant(19)); - delete obj; + delete obj; } { - QDeclarativeComponent component(&engine); + QDeclarativeComponent component(&engine); component.setData("import QtQuick 1.0; QtObject { property variant test: b }", QUrl()); - QObject *obj = component.create(&ctxt2); + QObject *obj = component.create(&ctxt2); - QCOMPARE(obj->property("test"), QVariant(8)); + QCOMPARE(obj->property("test"), QVariant(8)); ctxt.setContextProperty("b", QVariant(5)); - QCOMPARE(obj->property("test"), QVariant(8)); + QCOMPARE(obj->property("test"), QVariant(8)); ctxt2.setContextProperty("b", QVariant(1912)); - QCOMPARE(obj->property("test"), QVariant(1912)); + QCOMPARE(obj->property("test"), QVariant(1912)); - delete obj; + delete obj; } { - QDeclarativeComponent component(&engine); + QDeclarativeComponent component(&engine); component.setData("import QtQuick 1.0; QtObject { property variant test: e.a }", QUrl()); - QObject *obj = component.create(&ctxt2); + QObject *obj = component.create(&ctxt2); - QCOMPARE(obj->property("test"), QVariant(12)); + QCOMPARE(obj->property("test"), QVariant(12)); obj1.setA(13); - QCOMPARE(obj->property("test"), QVariant(13)); + QCOMPARE(obj->property("test"), QVariant(13)); - delete obj; + delete obj; } // New context properties { - QDeclarativeComponent component(&engine); + QDeclarativeComponent component(&engine); component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl()); - QObject *obj = component.create(&ctxt2); + QObject *obj = component.create(&ctxt2); - QCOMPARE(obj->property("test"), QVariant(19)); + QCOMPARE(obj->property("test"), QVariant(19)); ctxt2.setContextProperty("a", QVariant(1945)); - QCOMPARE(obj->property("test"), QVariant(1945)); + QCOMPARE(obj->property("test"), QVariant(1945)); - delete obj; + delete obj; } // Setting an object-variant context property @@ -379,16 +379,16 @@ void tst_qdeclarativecontext::setContextObject() // Changes in context properties { - QDeclarativeComponent component(&engine); + QDeclarativeComponent component(&engine); component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl()); - QObject *obj = component.create(&ctxt); + QObject *obj = component.create(&ctxt); - QCOMPARE(obj->property("test"), QVariant(12)); + QCOMPARE(obj->property("test"), QVariant(12)); to.setA(14); - QCOMPARE(obj->property("test"), QVariant(14)); + QCOMPARE(obj->property("test"), QVariant(14)); - delete obj; + delete obj; } } diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index ed9db842..f4f4e526 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -229,7 +229,7 @@ void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDe else QCOMPARE(p.valueTypeName(), QString::fromUtf8(pmeta.typeName())); - QDeclarativeAbstractBinding *binding = + QDeclarativeAbstractBinding *binding = QDeclarativePropertyPrivate::binding(QDeclarativeProperty(o, p.name())); if (binding) QCOMPARE(binding->expression(), p.binding()); diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml index f0808c4c..75857650 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 Item { id: root - + property bool test: false property real testData: 9 diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.3.qml index 937ae91c..bfd3c174 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.3.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml index da6c795b..746d9dbf 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml index 2c797296..081abd42 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml @@ -11,7 +11,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/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml index 9443c01d..e2f7737a 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml @@ -13,7 +13,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/declarative/qdeclarativeecmascript/data/bindingLoop.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml index 80545cf7..e49a26d9 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml index 3147f639..054ecb98 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml index c89bb49b..37c747b3 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml index 207a06b7..7a0b0d6e 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml index 5a2091f7..0c900d78 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/deletedEngine.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml index 4de405dc..e4c19d2f 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 QtObject { function calculate() { - return b * 13; + return b * 13; } property int a: calculate() diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml b/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml index 661cd5c4..5ac645d1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml @@ -1,11 +1,11 @@ import QtQuick 1.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/declarative/qdeclarativeecmascript/data/include.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include.qml index 61b04618..4d9b2e84 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/include_callback.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml index 1633ebaa..b93ffec8 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/include_remote.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js index e6a46768..4331cb79 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/include_remote_missing.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js index cc90860c..27dd63ba 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/include_shared.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml index e9f1c89b..fb200a84 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/methods.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml index 0bbee16d..5c5b3412 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/methods.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml index 9f0c6b15..b2adaf65 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml index 090c948f..a57b09fe 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/propertySplicing.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertySplicing.qml index 7deb84a1..23071c0f 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertySplicing.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertySplicing.qml @@ -3,7 +3,7 @@ import QtQuick 1.0 MyDerivedObject { property bool test: false - + Component.onCompleted: { test = intProperty() } diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml index 9555b7f9..b60b2ed1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml index 65697d93..203b8aea 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml @@ -1,10 +1,10 @@ import Qt.test 1.0 import QtQuick 1.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/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml index 86ff7987..aac119d1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 1.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/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml index db2f0057..ce715afb 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml @@ -1,11 +1,11 @@ import Qt.test 1.0 import QtQuick 1.0 -MyQmlObject { +MyQmlObject { property bool test: false id: root - + function testFunction() { test = true; } diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml index a2d90ff8..62f1f94d 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml @@ -1,7 +1,7 @@ import Qt.test 1.0 import QtQuick 1.0 -MyQmlObject { +MyQmlObject { property bool test: false id: root diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml index 21fac15d..786e1519 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml @@ -1,7 +1,7 @@ import Qt.test 1.0 import QtQuick 1.0 -MyQmlObject { +MyQmlObject { property bool test: false id: root diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml index 40530919..b1000ade 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml @@ -2,12 +2,12 @@ import Qt.test 1.0 import QtQuick 1.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/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml index bbe70249..ec00d0fa 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 1.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/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml index 8a166f41..5cb7e084 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 1.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/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml index 548f2a12..37abdb12 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 1.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/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml index 11b22d72..783d7a30 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml @@ -2,11 +2,11 @@ import Qt.test 1.0 import QtQuick 1.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/declarative/qdeclarativeecmascript/data/scriptErrors.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js index d22f623e..4f16ef4e 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml index 58cf8051..d1bddb43 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml index fbd09142..fbafd843 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml index 6467c42b..84065668 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml index 8410d333..250b2d84 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/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/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h index 908035df..ba701576 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h @@ -114,7 +114,7 @@ public: } QObject *objectProperty() const { return m_object; } - void setObjectProperty(QObject *obj) { + void setObjectProperty(QObject *obj) { if (obj == m_object) return; m_object = obj; @@ -157,7 +157,7 @@ public: int value; }; QVariant variant() const { return m_variant; } - + signals: void basicSignal(); void argumentSignal(int a, QString b, qreal c, MyEnum2 d, Qt::MouseButtons e); @@ -624,7 +624,7 @@ public: Q_INVOKABLE void method_QObject(QObject *a) { invoke(13); m_actuals << qVariantFromValue(a); } Q_INVOKABLE void method_QScriptValue(QScriptValue a) { invoke(14); m_actuals << qVariantFromValue(a); } Q_INVOKABLE void method_intQScriptValue(int a, QScriptValue 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/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index f30a61b1..b861c715 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -453,7 +453,7 @@ void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval() context.setContextProperty("testObj", &object1); context.setContextProperty("testObj2", object3); - { + { MyExpression expr(&context, "testProp + 1"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant(2)); @@ -463,7 +463,7 @@ void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant(3)); } - { + { MyExpression expr(&context, "testProp + testProp + testProp"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant(6)); @@ -473,7 +473,7 @@ void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant(12)); } - { + { MyExpression expr(&context, "testObj.stringProperty"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant("Hello")); @@ -483,7 +483,7 @@ void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant("World")); } - { + { MyExpression expr(&context, "testObj.stringProperty /**/"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant("World")); @@ -493,7 +493,7 @@ void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant("Hello")); } - { + { MyExpression expr(&context, "testObj2"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant::fromValue((QObject *)object3)); @@ -513,7 +513,7 @@ void tst_qdeclarativeecmascript::objectPropertiesTriggerReeval() object2.setStringProperty(QLatin1String("Dog")); object3.setStringProperty(QLatin1String("Cat")); - { + { MyExpression expr(&context, "testObj.stringProperty"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant("Hello")); @@ -523,7 +523,7 @@ void tst_qdeclarativeecmascript::objectPropertiesTriggerReeval() QCOMPARE(expr.evaluate(), QVariant("World")); } - { + { MyExpression expr(&context, "testObj.objectProperty.stringProperty"); QCOMPARE(expr.changed, false); QCOMPARE(expr.evaluate(), QVariant()); @@ -558,7 +558,7 @@ void tst_qdeclarativeecmascript::objectPropertiesTriggerReeval() void tst_qdeclarativeecmascript::deferredProperties() { QDeclarativeComponent component(&engine, testFileUrl("deferredProperties.qml")); - MyDeferredObject *object = + MyDeferredObject *object = qobject_cast<MyDeferredObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->value(), 0); @@ -567,7 +567,7 @@ void tst_qdeclarativeecmascript::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); @@ -579,7 +579,7 @@ void tst_qdeclarativeecmascript::deferredProperties() void tst_qdeclarativeecmascript::deferredPropertiesErrors() { QDeclarativeComponent component(&engine, testFileUrl("deferredPropertiesErrors.qml")); - MyDeferredObject *object = + MyDeferredObject *object = qobject_cast<MyDeferredObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->value(), 0); @@ -597,7 +597,7 @@ void tst_qdeclarativeecmascript::deferredPropertiesErrors() void tst_qdeclarativeecmascript::extensionObjects() { QDeclarativeComponent component(&engine, testFileUrl("extensionObjects.qml")); - MyExtendedObject *object = + MyExtendedObject *object = qobject_cast<MyExtendedObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->baseProperty(), 13); @@ -709,7 +709,7 @@ void tst_qdeclarativeecmascript::valueTypeFunctions() QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5)); } -/* +/* Tests that writing a constant to a property with a binding on it disables the binding. */ @@ -784,7 +784,7 @@ the original binding to be disabled. */ void tst_qdeclarativeecmascript::outerBindingOverridesInnerBinding() { - QDeclarativeComponent component(&engine, + QDeclarativeComponent component(&engine, testFileUrl("outerBindingOverridesInnerBinding.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -805,7 +805,7 @@ void tst_qdeclarativeecmascript::outerBindingOverridesInnerBinding() } /* -Access a non-existent attached object. +Access a non-existent attached object. Tests for a regression where this used to crash. */ @@ -1121,7 +1121,7 @@ void tst_qdeclarativeecmascript::propertyAssignmentErrors() delete object; } - + /* Test bindings still work when the reeval is triggered from within a signal script. @@ -1921,7 +1921,7 @@ void tst_qdeclarativeecmascript::attachedPropertyScope() QObject *object = component.create(); QVERIFY(object != 0); - MyQmlAttachedObject *attached = + MyQmlAttachedObject *attached = qobject_cast<MyQmlAttachedObject *>(qmlAttachedPropertiesObject<MyQmlObject>(object)); QVERIFY(attached != 0); @@ -2166,7 +2166,7 @@ public: QPointer<QObject> value; }; -// QTBUG-15695. +// QTBUG-15695. // Test setObjectOwnership(CppOwnership) works even when there is no QDeclarativeData void tst_qdeclarativeecmascript::cppOwnershipReturnValue() { @@ -2376,7 +2376,7 @@ void tst_qdeclarativeecmascript::signalWithUnknownTypes() delete object; } -// Test that assigning a null object works +// Test that assigning a null object works // Regressed with: df1788b4dbbb2826ae63f26bdf166342595343f4 void tst_qdeclarativeecmascript::nullObjectBinding() { @@ -2460,7 +2460,7 @@ void tst_qdeclarativeecmascript::qtbug_9792() QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler); object->basicSignal(); - + qInstallMessageHandler(old); QCOMPARE(transientErrorsMsgCount, 0); @@ -2560,7 +2560,7 @@ void tst_qdeclarativeecmascript::functionAssignment_fromBinding() QString url = component.url().toString(); QString warning = url + ":4: Unable to assign a function to a property."; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); - + MyQmlObject *o = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(o != 0); @@ -2877,7 +2877,7 @@ void tst_qdeclarativeecmascript::aliasBindingsAssignCorrectly() // Test bindings assigned to alias properties override a binding on the target (QTBUG-13719) void tst_qdeclarativeecmascript::aliasBindingsOverrideTarget() { - { + { QDeclarativeComponent component(&engine, testFileUrl("aliasBindingsOverrideTarget.qml")); QObject *o = component.create(); QVERIFY(o != 0); diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro index 0b997356..847adfa5 100644 --- a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro +++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro @@ -4,7 +4,7 @@ TARGET = tst_qdeclarativeengine QT += testlib declarative network macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeengine.cpp +SOURCES += tst_qdeclarativeengine.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp index 1a898dbb..35c9d4aa 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp @@ -113,8 +113,8 @@ void tst_qdeclarativefolderlistmodel::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/declarative/qdeclarativegridview/data/gridview-enforcerange.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml index 69eaa477..684137cf 100644 --- a/tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml +++ b/tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml @@ -39,7 +39,7 @@ Rectangle { color: "lightsteelblue" } } - + GridView { id: grid objectName: "grid" diff --git a/tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml b/tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml index 10df2342..d0318df8 100644 --- a/tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml +++ b/tests/auto/declarative/qdeclarativegridview/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/declarative/qdeclarativeimage/data/aspectratio.qml b/tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml index cd092bc7..bcca59be 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml +++ b/tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -Image { +Image { property int widthChange: 0 property int heightChange: 0 source: "heart.png" diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 2b099ad1..258d8299 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -693,7 +693,7 @@ void tst_qdeclarativeimage::nullPixmapPaint() QDeclarativeImage *image = qobject_cast<QDeclarativeImage*>(component.create()); QTRY_VERIFY(image != 0); - + QtMessageHandler previousMsgHandler = qInstallMessageHandler(checkWarnings); QPixmap pm(100, 100); diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp index ebafb28b..a4b305c8 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp +++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp @@ -99,10 +99,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); @@ -136,10 +136,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); @@ -155,7 +155,7 @@ Q_DECLARE_METATYPE(TestQPixmapProvider*); QString tst_qdeclarativeimageprovider::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++); @@ -223,7 +223,7 @@ void tst_qdeclarativeimageprovider::runTest(bool async, QDeclarativeImageProvide engine.addImageProvider("test", provider); QVERIFY(engine.imageProvider("test") != 0); - QString componentStr = "import QtQuick 1.0\nImage { source: \"" + source + "\"; " + QString componentStr = "import QtQuick 1.0\nImage { source: \"" + source + "\"; " + (async ? "asynchronous: true; " : "") + properties + " }"; QDeclarativeComponent component(&engine); @@ -231,7 +231,7 @@ void tst_qdeclarativeimageprovider::runTest(bool async, QDeclarativeImageProvide QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create()); QVERIFY(obj != 0); - if (async) + if (async) QTRY_VERIFY(obj->status() == QDeclarativeImage::Loading); QCOMPARE(obj->source(), QUrl(source)); diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index d4b87109..f37d4b6b 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -530,7 +530,7 @@ void tst_qdeclarativeinstruction::dump() } QStringList expect; - expect + expect << "Index\tLine\tOperation\t\tData1\tData2\tData3\tComments" << "-------------------------------------------------------------------------------" << "0\t\t0\tINIT\t\t\t0\t3\t-1\t-1" diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml index 9d8e1e86..911108aa 100644 --- a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml +++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml @@ -9,7 +9,7 @@ Rectangle { Repeater { model: 1 - Rectangle { } + Rectangle { } } } } diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index 0251d74d..046f113b 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -519,7 +519,7 @@ void tst_QDeclarativeItem::layoutMirroring() QCOMPARE(childPrivate(rootItem, "inheritedMirror2")->inheritedLayoutMirror, true); QCOMPARE(childPrivate(rootItem, "mirrored1")->inheritedLayoutMirror, true); QCOMPARE(childPrivate(rootItem, "notMirrored1")->inheritedLayoutMirror, true); - + // // dynamic parenting // @@ -549,7 +549,7 @@ void tst_QDeclarativeItem::layoutMirroring() childItem2->setParentItem(parentItem2); QCOMPARE(QDeclarativeItemPrivate::get(childItem2)->effectiveLayoutMirror, false); QCOMPARE(QDeclarativeItemPrivate::get(childItem2)->inheritMirrorFromParent, false); - + delete parentItem1; delete parentItem2; } @@ -922,7 +922,7 @@ void tst_QDeclarativeItem::transforms() void tst_QDeclarativeItem::childrenProperty() { QDeclarativeComponent component(&engine, SRCDIR "/data/childrenProperty.qml"); - + QObject *o = component.create(); QVERIFY(o != 0); @@ -937,7 +937,7 @@ void tst_QDeclarativeItem::childrenProperty() void tst_QDeclarativeItem::resourcesProperty() { QDeclarativeComponent component(&engine, SRCDIR "/data/resourcesProperty.qml"); - + QObject *o = component.create(); QVERIFY(o != 0); diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml index 8aaddace..0328f8d2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml +++ b/tests/auto/declarative/qdeclarativelanguage/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/declarative/qdeclarativelanguage/data/OnCompletedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml index c2ac5c84..62425c63 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml @@ -3,6 +3,6 @@ import QtQuick 1.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/declarative/qdeclarativelanguage/data/OnDestructionType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml index c3d0e1ef..5b7d4130 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml @@ -3,6 +3,6 @@ import QtQuick 1.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/declarative/qdeclarativelanguage/data/alias.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml index bd6a7693..da6c6e78 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml @@ -1,6 +1,6 @@ import Test 1.0 Alias2 { - enumAlias: MyTypeObject.EnumVal2 + enumAlias: MyTypeObject.EnumVal2 } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml index 0c839ee7..225c0823 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml +++ b/tests/auto/declarative/qdeclarativelanguage/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/declarative/qdeclarativelanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml index 9fe0ded4..2ce1dfe6 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml @@ -10,7 +10,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/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml index 87dc3d3e..c1ad5483 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml +++ b/tests/auto/declarative/qdeclarativelanguage/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/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml index c03ec492..25a821d3 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 1.0 import QtQuick 1.0 as Qt47 Qt.QtObject { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml index ed25c4b8..7a0e6b69 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml +++ b/tests/auto/declarative/qdeclarativelanguage/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/declarative/qdeclarativelanguage/data/interfaceQList.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml index c87dfae7..2e968e4f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml @@ -1,6 +1,6 @@ import Test 1.0 MyContainer { - qlistInterfaces: [ + qlistInterfaces: [ MyQmlObject {}, MyQmlObject {} ] diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml index 94afb16c..f26d52d4 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 1.0 QtObject { property variant o; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml index d4fbf423..b3420ac1 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 1.0 QtObject { property int o; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml index 5b086088..b1610f7b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/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/declarative/qdeclarativelanguage/data/onCompleted.qml b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml index e75f9044..a6b6111c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml +++ b/tests/auto/declarative/qdeclarativelanguage/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/declarative/qdeclarativelanguage/data/onDestruction.qml b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml index 77fe2ff3..c1ec8188 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml +++ b/tests/auto/declarative/qdeclarativelanguage/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/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h index 37a91e01..c6388d86 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h @@ -58,7 +58,7 @@ QVariant myCustomVariantTypeConverter(const QString &data); -class MyInterface +class MyInterface { public: MyInterface() : id(913) {} diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 8052f5fc..4b4bab3f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -412,11 +412,11 @@ void tst_qdeclarativelanguage::errors_data() #endif 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; @@ -522,7 +522,7 @@ void tst_qdeclarativelanguage::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_qdeclarativelanguage::assignBasicTypes() { QDeclarativeComponent component(&engine, testFileUrl("assignBasicTypes.qml")); @@ -666,7 +666,7 @@ void tst_qdeclarativelanguage::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")); @@ -826,12 +826,12 @@ void tst_qdeclarativelanguage::propertyValueSource() QList<QObject *> valueSources; QObjectList allChildren = object->findChildren<QObject*>(); foreach (QObject *child, allChildren) { - if (qobject_cast<QDeclarativePropertyValueSource *>(child)) + if (qobject_cast<QDeclarativePropertyValueSource *>(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)); @@ -847,12 +847,12 @@ void tst_qdeclarativelanguage::propertyValueSource() QList<QObject *> valueSources; QObjectList allChildren = object->findChildren<QObject*>(); foreach (QObject *child, allChildren) { - if (qobject_cast<QDeclarativePropertyValueSource *>(child)) + if (qobject_cast<QDeclarativePropertyValueSource *>(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)); @@ -975,7 +975,7 @@ void tst_qdeclarativelanguage::aliasProperties() QVERIFY(object != 0); // Read through alias - MyQmlObject *v = + MyQmlObject *v = qvariant_cast<MyQmlObject *>(object->property("aliasObject")); QVERIFY(v != 0); QCOMPARE(v->value(), 10); @@ -984,7 +984,7 @@ void tst_qdeclarativelanguage::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); @@ -1057,7 +1057,7 @@ void tst_qdeclarativelanguage::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 { QDeclarativeComponent component(&engine, testFileUrl("alias.7.qml")); @@ -1280,7 +1280,7 @@ void tst_qdeclarativelanguage::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_qdeclarativelanguage::defaultPropertyListOrder() { diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml index cc6d9de8..734ffb71 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml +++ b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml @@ -2,12 +2,12 @@ import QtQuick 1.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/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index bdf86641..706985ae 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -126,7 +126,7 @@ QDeclarativeItem *tst_qdeclarativelistmodel::createWorkerTest(QDeclarativeEngine QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component->create()); QDeclarativeEngine::setContextForObject(model, eng->rootContext()); if (item) - item->setProperty("model", qVariantFromValue(model)); + item->setProperty("model", qVariantFromValue(model)); return item; } @@ -167,17 +167,17 @@ void tst_qdeclarativelistmodel::static_nestedElements() QFETCH(int, elementCount); QStringList elements; - for (int i=0; i<elementCount; i++) + for (int i=0; i<elementCount; i++) elements.append("ListElement { a: 1; b: 2 }"); QString elementsStr = elements.join(",\n") + "\n"; - QString componentStr = + QString componentStr = "import QtQuick 1.0\n" "ListModel {\n" " ListElement {\n" " attributes: [\n"; componentStr += elementsStr.toUtf8().constData(); - componentStr += + componentStr += " ]\n" " }\n" "}"; @@ -342,7 +342,7 @@ void tst_qdeclarativelistmodel::dynamic_worker() if (QByteArray(QTest::currentDataTag()).startsWith("nested")) return; - // This is same as dynamic() except it applies the test to a ListModel called + // This is same as dynamic() except it applies the test to a ListModel called // from a WorkerScript (i.e. testing the internal FlatListModel that is created // by the WorkerListModelAgent) @@ -393,7 +393,7 @@ void tst_qdeclarativelistmodel::dynamic_worker_sync() // This is the same as dynamic_worker() except that it executes a set of list operations // from the worker script, calls sync(), and tests the changes are reflected in the // list in the main thread - + QDeclarativeListModel model; QDeclarativeEngine eng; QDeclarativeComponent component(&eng, QUrl::fromLocalFile(SRCDIR "/data/model.qml")); @@ -419,7 +419,7 @@ void tst_qdeclarativelistmodel::dynamic_worker_sync() if (QByteArray(QTest::currentDataTag()).startsWith("nested-set")) QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: Cannot add list-type data when modifying or after modification from a worker script"); - QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", + QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", Q_ARG(QVariant, operations.mid(0, operations.length()-1)))); waitForWorker(item); @@ -709,12 +709,12 @@ void tst_qdeclarativelistmodel::set() sv.setProperty("test", QScriptValue(true)); model.set(0, sv); QCOMPARE(model.get(0).property("test").toBool(), true); // triggers creation of model cache - QCOMPARE(model.data(0, model.roles()[0]), qVariantFromValue(true)); + QCOMPARE(model.data(0, model.roles()[0]), qVariantFromValue(true)); sv.setProperty("test", QScriptValue(false)); model.set(0, sv); QCOMPARE(model.get(0).property("test").toBool(), false); // tests model cache is updated - QCOMPARE(model.data(0, model.roles()[0]), qVariantFromValue(false)); + QCOMPARE(model.data(0, model.roles()[0]), qVariantFromValue(false)); } /* @@ -761,8 +761,8 @@ void tst_qdeclarativelistmodel::get_data() QTest::addColumn<QString>("roleName"); QTest::addColumn<QVariant>("roleValue"); - QTest::newRow("simple value") << "get(0).roleA = 500" << 0 << "roleA" << QVariant(500); - QTest::newRow("simple value 2") << "get(1).roleB = 500" << 1 << "roleB" << QVariant(500); + QTest::newRow("simple value") << "get(0).roleA = 500" << 0 << "roleA" << QVariant(500); + QTest::newRow("simple value 2") << "get(1).roleB = 500" << 1 << "roleB" << QVariant(500); QVariantMap map; map["zzz"] = 123; diff --git a/tests/auto/declarative/qdeclarativelistview/data/headerfooter.qml b/tests/auto/declarative/qdeclarativelistview/data/headerfooter.qml index 56338319..594f8641 100644 --- a/tests/auto/declarative/qdeclarativelistview/data/headerfooter.qml +++ b/tests/auto/declarative/qdeclarativelistview/data/headerfooter.qml @@ -6,7 +6,7 @@ ListView { property bool rtl: false width: 240 height: 320 - + orientation: horizontal ? ListView.Horizontal : ListView.Vertical header: Rectangle { objectName: "header" diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml index 49dbcb38..1377ec60 100644 --- a/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml +++ b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml @@ -39,7 +39,7 @@ Rectangle { color: "lightsteelblue" } } - + ListView { id: list objectName: "list" diff --git a/tests/auto/declarative/qdeclarativelistview/data/orientchange.qml b/tests/auto/declarative/qdeclarativelistview/data/orientchange.qml index c7aa0cd1..4d84f297 100644 --- a/tests/auto/declarative/qdeclarativelistview/data/orientchange.qml +++ b/tests/auto/declarative/qdeclarativelistview/data/orientchange.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 1.0 ListView { width: 240; height: 320 diff --git a/tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml b/tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml index 04bec59a..916959bf 100644 --- a/tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml +++ b/tests/auto/declarative/qdeclarativelistview/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/declarative/qdeclarativelistview/incrementalmodel.cpp b/tests/auto/declarative/qdeclarativelistview/incrementalmodel.cpp index fd0e1cc7..380b5dc6 100644 --- a/tests/auto/declarative/qdeclarativelistview/incrementalmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistview/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/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp index 75507c21..519374f4 100644 --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp @@ -195,7 +195,7 @@ void tst_QDeclarativeLoader::clear() QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); QVERIFY(item); - QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); + QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); QVERIFY(loader); QVERIFY(loader->item()); QCOMPARE(loader->progress(), 1.0); @@ -215,7 +215,7 @@ void tst_QDeclarativeLoader::clear() QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); QVERIFY(item); - QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); + QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); QVERIFY(loader); QVERIFY(loader->item()); QCOMPARE(loader->progress(), 1.0); @@ -261,7 +261,7 @@ void tst_QDeclarativeLoader::componentToUrl() QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); QVERIFY(item); - QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); + QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); QVERIFY(loader); QVERIFY(loader->item()); QCOMPARE(loader->progress(), 1.0); @@ -496,7 +496,7 @@ void tst_QDeclarativeLoader::networkComponent() QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); QVERIFY(item); - QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); + QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); QVERIFY(loader); QTRY_VERIFY(loader->status() == QDeclarativeLoader::Ready); diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index e27c95e5..210e2c80 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -178,7 +178,7 @@ void tst_qdeclarativemetatype::copy() QT_COPY_TEST(QRect, QRect(-10, 10, 102, 99)); QT_COPY_TEST(QRectF, QRectF(-10.2, 1.2, 102, 99.6)); QT_COPY_TEST(QSize, QSize(100, 2)); - QT_COPY_TEST(QSizeF, QSizeF(20.2, -100234.2)); + QT_COPY_TEST(QSizeF, QSizeF(20.2, -100234.2)); QT_COPY_TEST(QLine, QLine(0, 0, 100, 100)); QT_COPY_TEST(QLineF, QLineF(-10.2, 0, 103, 1)); QT_COPY_TEST(QPoint, QPoint(-1912, 1613)); @@ -197,32 +197,32 @@ void tst_qdeclarativemetatype::copy() { QPixmap v = QPixmap(100, 100); QPixmap v2 = QPixmap(100, 100); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap, &v, 0)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap, &v, 0)); QVERIFY(v.size() == QPixmap().size()); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap , &v, &v2)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap , &v, &v2)); QVERIFY(v.size() == QPixmap(100,100).size()); } QT_COPY_TEST(QBrush, QBrush(Qt::blue)); QT_COPY_TEST(QColor, QColor("lightsteelblue")); QT_COPY_TEST(QPalette, QPalette(Qt::green)); - + { QPixmap icon(100, 100); QIcon v = QIcon(icon); QIcon v2 = QIcon(icon); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon, &v, 0)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon, &v, 0)); QVERIFY(v.isNull() == QIcon().isNull()); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon , &v, &v2)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon , &v, &v2)); QVERIFY(v.isNull() == QIcon(icon).isNull()); } { - QImage v = QImage(100, 100, QImage::Format_RGB32); + QImage v = QImage(100, 100, QImage::Format_RGB32); QImage v2 = QImage(100, 100, QImage::Format_RGB32); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage, &v, 0)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage, &v, 0)); QVERIFY(v.size() == QImage().size()); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage , &v, &v2)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage , &v, &v2)); QVERIFY(v.size() == QImage(100,100, QImage::Format_RGB32).size()); } @@ -231,17 +231,17 @@ void tst_qdeclarativemetatype::copy() { QBitmap v = QBitmap(100, 100); QBitmap v2 = QBitmap(100, 100); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap, &v, 0)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap, &v, 0)); QVERIFY(v.size() == QBitmap().size()); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap , &v, &v2)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap , &v, &v2)); QVERIFY(v.size() == QBitmap(100,100).size()); } { QCursor v = QCursor(Qt::SizeFDiagCursor); QCursor v2 = QCursor(Qt::SizeFDiagCursor); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor, &v, 0)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor, &v, 0)); QVERIFY(v.shape() == QCursor().shape()); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor , &v, &v2)); + QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor , &v, &v2)); QVERIFY(v.shape() == QCursor(Qt::SizeFDiagCursor).shape()); } @@ -275,9 +275,9 @@ void tst_qdeclarativemetatype::copy() { QVariant tv = QVariant::fromValue(QVariant(10)); QVariant v(tv); QVariant v2(tv); - QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, 0)); + QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, 0)); QVERIFY(v == QVariant()); - QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, &v2)); + QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, &v2)); QVERIFY(v == tv); } @@ -285,9 +285,9 @@ void tst_qdeclarativemetatype::copy() TestType t; QVariant tv = QVariant::fromValue(&t); QVariant v(tv); QVariant v2(tv); - QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, 0)); + QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, 0)); QVERIFY(v == QVariant::fromValue((TestType *)0)); - QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, &v2)); + QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, &v2)); QVERIFY(v == tv); } } @@ -299,7 +299,7 @@ void tst_qdeclarativemetatype::qmlParserStatusCast() QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->parserStatusCast(), -1); QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0); QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->parserStatusCast(), -1); - + QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0); int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->parserStatusCast(); QVERIFY(cast != -1); @@ -319,7 +319,7 @@ void tst_qdeclarativemetatype::qmlPropertyValueSourceCast() QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueSourceCast(), -1); QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0); QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueSourceCast(), -1); - + QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0); int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->propertyValueSourceCast(); QVERIFY(cast != -1); @@ -339,7 +339,7 @@ void tst_qdeclarativemetatype::qmlPropertyValueInterceptorCast() QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueInterceptorCast(), -1); QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0); QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueInterceptorCast(), -1); - + QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>()) != 0); int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>())->propertyValueInterceptorCast(); QVERIFY(cast != -1); diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml index 3fc7a0e5..0f90bb8a 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/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/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml index 335cc37b..1234fcc9 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml @@ -3,7 +3,7 @@ import QtQuick 1.0 Item { property bool test: false - Bar { + Bar { id: bar } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index 8c1cd6af..e89b46f0 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -117,7 +117,7 @@ void tst_qdeclarativemoduleplugin::importsPlugin() QTest::ignoreMessage(QtWarningMsg, "import worked"); QDeclarativeComponent component(&engine, testFileUrl("works.qml")); foreach (QDeclarativeError err, component.errors()) - qWarning() << err; + qWarning() << err; VERIFY_ERRORS(0); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml index 7baefd5d..dd89efb5 100644 --- a/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml +++ b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml @@ -1,7 +1,7 @@ import QtQuick 1.0 Rectangle { id: whiteRect - width: 200 + width: 200 height: 200 color: "white" Rectangle { diff --git a/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml b/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml index c6d2e204..77087afb 100644 --- a/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml +++ b/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml @@ -1,7 +1,7 @@ import QtQuick 1.0 Rectangle { id: whiteRect - width: 200 + width: 200 height: 200 color: "white" Rectangle { diff --git a/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml b/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml index c0cc8555..43fe2628 100644 --- a/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml +++ b/tests/auto/declarative/qdeclarativepathview/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/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 50f3e027..6c30346f 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -269,7 +269,7 @@ void tst_qdeclarativepixmapcache::parallel() if (i == cancel) { QVERIFY(!getters[i]->gotslot); } else { - if (pending[i]) + if (pending[i]) QVERIFY(getters[i]->gotslot); QVERIFY(pixmap->isReady()); diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp index e5be328c..be127c31 100644 --- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp +++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp @@ -325,8 +325,8 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object() void tst_qdeclarativeproperty::qmlmetaproperty_object_string() { - QObject object; - PropertyObject dobject; + QObject object; + PropertyObject dobject; { QDeclarativeProperty prop(&object, QString("defaultProperty")); @@ -623,8 +623,8 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_context() void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context() { - QObject object; - PropertyObject dobject; + QObject object; + PropertyObject dobject; { QDeclarativeProperty prop(&object, QString("defaultProperty"), engine.rootContext()); @@ -820,7 +820,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context() void tst_qdeclarativeproperty::name() { - { + { QDeclarativeProperty p; QCOMPARE(p.name(), QString()); } @@ -893,7 +893,7 @@ void tst_qdeclarativeproperty::name() void tst_qdeclarativeproperty::read() { - // Invalid + // Invalid { QDeclarativeProperty p; QCOMPARE(p.read(), QVariant()); @@ -962,7 +962,7 @@ void tst_qdeclarativeproperty::read() QCOMPARE(p.read(), QVariant()); } - // Automatic signal property + // Automatic signal property { PropertyObject o; QDeclarativeProperty p(&o, "onPropertyWithNotifyChanged"); diff --git a/tests/auto/declarative/qdeclarativerepeater/data/properties.qml b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml index 689a1030..33d2dacf 100644 --- a/tests/auto/declarative/qdeclarativerepeater/data/properties.qml +++ b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml @@ -1,11 +1,11 @@ import QtQuick 1.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/declarative/qdeclarativespringanimation/data/springanimation2.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml index de75bb06..ce6a4aec 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml +++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml @@ -4,6 +4,6 @@ SpringAnimation { to: 1.44; velocity: 0.9 spring: 1.0; damping: 0.5 epsilon: 0.25; modulus: 360.0 - mass: 2.0; + mass: 2.0; running: true; } diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp index 7737f6a3..f8ce8a26 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp @@ -71,7 +71,7 @@ public: MyRect() {} void doSomething() { emit didSomething(); } - + int propertyWithNotify() const { return m_prop; } void setPropertyWithNotify(int i) { m_prop = i; emit oddlyNamedNotifySignal(); } @@ -151,7 +151,7 @@ void tst_qdeclarativestates::initTestCase() QByteArray tst_qdeclarativestates::fullDataPath(const QString &path) { - return QUrl::fromLocalFile(SRCDIR + path).toString().toUtf8(); + return QUrl::fromLocalFile(SRCDIR + path).toString().toUtf8(); } void tst_qdeclarativestates::basicChanges() diff --git a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp index 10bd1808..382d00b5 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp +++ b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp @@ -57,7 +57,7 @@ private slots: }; // For malformed input all we test is that we get the expected text out. -// +// void tst_qdeclarativestyledtext::textOutput_data() { QTest::addColumn<QString>("input"); diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 7f05cc53..0bb1e486 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -77,7 +77,7 @@ private slots: void lineCount(); void lineHeight(); - // ### these tests may be trivial + // ### these tests may be trivial void horizontalAlignment(); void horizontalAlignment_RightToLeft(); void verticalAlignment(); @@ -704,7 +704,7 @@ void tst_qdeclarativetext::font() QCOMPARE(textObject->font().italic(), false); } - { + { QString componentStr = "import QtQuick 1.0\nText { font.bold: true; text: \"Hello World\" }"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -714,7 +714,7 @@ void tst_qdeclarativetext::font() QCOMPARE(textObject->font().italic(), false); } - { + { QString componentStr = "import QtQuick 1.0\nText { font.italic: true; text: \"Hello World\" }"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -724,7 +724,7 @@ void tst_qdeclarativetext::font() QCOMPARE(textObject->font().bold(), false); } - { + { QString componentStr = "import QtQuick 1.0\nText { font.family: \"Helvetica\"; text: \"Hello World\" }"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -735,7 +735,7 @@ void tst_qdeclarativetext::font() QCOMPARE(textObject->font().italic(), false); } - { + { QString componentStr = "import QtQuick 1.0\nText { font.family: \"\"; text: \"Hello World\" }"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -749,7 +749,7 @@ void tst_qdeclarativetext::style() { //test style for (int i = 0; i < styles.size(); i++) - { + { QString componentStr = "import QtQuick 1.0\nText { style: \"" + styleStrings.at(i) + "\"; styleColor: \"white\"; text: \"Hello World\" }"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -775,7 +775,7 @@ void tst_qdeclarativetext::color() { //test style for (int i = 0; i < colorStrings.size(); i++) - { + { QString componentStr = "import QtQuick 1.0\nText { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -786,7 +786,7 @@ void tst_qdeclarativetext::color() } for (int i = 0; i < colorStrings.size(); i++) - { + { QString componentStr = "import QtQuick 1.0\nText { styleColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -796,9 +796,9 @@ void tst_qdeclarativetext::color() // default color to black? QCOMPARE(textObject->color(), QColor("black")); } - + for (int i = 0; i < colorStrings.size(); i++) - { + { for (int j = 0; j < colorStrings.size(); j++) { QString componentStr = "import QtQuick 1.0\nText { color: \"" + colorStrings.at(i) + "\"; styleColor: \"" + colorStrings.at(j) + "\"; text: \"Hello World\" }"; @@ -1153,7 +1153,7 @@ void tst_qdeclarativetext::embeddedImages() if (!error.isEmpty()) QTest::ignoreMessage(QtWarningMsg, error.toLatin1()); - + QDeclarativeComponent textComponent(&engine, qmlfile); QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create()); diff --git a/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml index f7fb3e7c..9aee3784 100644 --- a/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml +++ b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml @@ -3,7 +3,7 @@ import QtQuick 1.0 Rectangle { width: 300; height: 300; color: "white" TextEdit { text: "Hello world!"; id: textEditObject; objectName: "textEditObject" anchors.fill: parent - resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance" } } ] + resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance" } } ] cursorDelegate: cursor } } diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml index 724c058d..766a3b8c 100644 --- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml +++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml @@ -1,12 +1,12 @@ import QtQuick 1.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 } diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml index 6dcf7855..9090d731 100644 --- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml +++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml @@ -1,11 +1,11 @@ import QtQuick 1.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 } diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml index 5f441d0d..4cd8a3c8 100644 --- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml +++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml @@ -1,11 +1,11 @@ import QtQuick 1.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 } diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml index 95f5d87e..8a469504 100644 --- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml +++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml @@ -1,10 +1,10 @@ import QtQuick 1.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/declarative/qdeclarativetextedit/data/inputmethodhints.qml b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml index 7df17f21..167f8837 100644 --- a/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml +++ b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -TextEdit { +TextEdit { text: "Hello world!" inputMethodHints: Qt.ImhNoPredictiveText } diff --git a/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml index 0e1caf6e..ac3c388b 100644 --- a/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml +++ b/tests/auto/declarative/qdeclarativetextedit/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/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index ccf7d66f..03283d93 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -115,7 +115,7 @@ private slots: void alignments(); void alignments_data(); - // ### these tests may be trivial + // ### these tests may be trivial void hAlign(); void hAlign_RightToLeft(); void vAlign(); @@ -234,7 +234,7 @@ tst_qdeclarativetextedit::tst_qdeclarativetextedit() // need a different test to do alpha channel test // << "#AA0011DD" // << "#00F16B11"; - // + // } void tst_qdeclarativetextedit::cleanup() @@ -644,7 +644,7 @@ void tst_qdeclarativetextedit::vAlign() void tst_qdeclarativetextedit::font() { //test size, then bold, then italic, then family - { + { QString componentStr = "import QtQuick 1.0\nTextEdit { font.pointSize: 40; text: \"Hello World\" }"; QDeclarativeComponent texteditComponent(&engine); texteditComponent.setData(componentStr.toLatin1(), QUrl()); @@ -656,7 +656,7 @@ void tst_qdeclarativetextedit::font() QCOMPARE(textEditObject->font().italic(), false); } - { + { QString componentStr = "import QtQuick 1.0\nTextEdit { font.bold: true; text: \"Hello World\" }"; QDeclarativeComponent texteditComponent(&engine); texteditComponent.setData(componentStr.toLatin1(), QUrl()); @@ -667,7 +667,7 @@ void tst_qdeclarativetextedit::font() QCOMPARE(textEditObject->font().italic(), false); } - { + { QString componentStr = "import QtQuick 1.0\nTextEdit { font.italic: true; text: \"Hello World\" }"; QDeclarativeComponent texteditComponent(&engine); texteditComponent.setData(componentStr.toLatin1(), QUrl()); @@ -677,8 +677,8 @@ void tst_qdeclarativetextedit::font() QCOMPARE(textEditObject->font().italic(), true); QCOMPARE(textEditObject->font().bold(), false); } - - { + + { QString componentStr = "import QtQuick 1.0\nTextEdit { font.family: \"Helvetica\"; text: \"Hello World\" }"; QDeclarativeComponent texteditComponent(&engine); texteditComponent.setData(componentStr.toLatin1(), QUrl()); @@ -690,7 +690,7 @@ void tst_qdeclarativetextedit::font() QCOMPARE(textEditObject->font().italic(), false); } - { + { QString componentStr = "import QtQuick 1.0\nTextEdit { font.family: \"\"; text: \"Hello World\" }"; QDeclarativeComponent texteditComponent(&engine); texteditComponent.setData(componentStr.toLatin1(), QUrl()); @@ -722,7 +722,7 @@ void tst_qdeclarativetextedit::color() } //test normal for (int i = 0; i < colorStrings.size(); i++) - { + { QString componentStr = "import QtQuick 1.0\nTextEdit { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QDeclarativeComponent texteditComponent(&engine); texteditComponent.setData(componentStr.toLatin1(), QUrl()); diff --git a/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml index 73085c17..765da4e0 100644 --- a/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml +++ b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 Rectangle { width: 300; height: 300; color: "white" TextInput { text: "Hello world!"; id: textInputObject; objectName: "textInputObject" - resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance";} } ] + resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance";} } ] cursorDelegate: cursor } } diff --git a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml index af1b1409..3bb6e457 100644 --- a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml +++ b/tests/auto/declarative/qdeclarativetextinput/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/declarative/qdeclarativetextinput/data/validators.qml b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml index e26bcb30..e51a00cb 100644 --- a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml +++ b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml @@ -18,5 +18,5 @@ Item { validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ } } } - + } diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 54b9f892..3ae795cc 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -277,7 +277,7 @@ void tst_qdeclarativetextinput::width() void tst_qdeclarativetextinput::font() { //test size, then bold, then italic, then family - { + { QString componentStr = "import QtQuick 1.0\nTextInput { font.pointSize: 40; text: \"Hello World\" }"; QDeclarativeComponent textinputComponent(&engine); textinputComponent.setData(componentStr.toLatin1(), QUrl()); @@ -291,7 +291,7 @@ void tst_qdeclarativetextinput::font() delete textinputObject; } - { + { QString componentStr = "import QtQuick 1.0\nTextInput { font.bold: true; text: \"Hello World\" }"; QDeclarativeComponent textinputComponent(&engine); textinputComponent.setData(componentStr.toLatin1(), QUrl()); @@ -304,7 +304,7 @@ void tst_qdeclarativetextinput::font() delete textinputObject; } - { + { QString componentStr = "import QtQuick 1.0\nTextInput { font.italic: true; text: \"Hello World\" }"; QDeclarativeComponent textinputComponent(&engine); textinputComponent.setData(componentStr.toLatin1(), QUrl()); @@ -316,8 +316,8 @@ void tst_qdeclarativetextinput::font() delete textinputObject; } - - { + + { QString componentStr = "import QtQuick 1.0\nTextInput { font.family: \"Helvetica\"; text: \"Hello World\" }"; QDeclarativeComponent textinputComponent(&engine); textinputComponent.setData(componentStr.toLatin1(), QUrl()); @@ -331,7 +331,7 @@ void tst_qdeclarativetextinput::font() delete textinputObject; } - { + { QString componentStr = "import QtQuick 1.0\nTextInput { font.family: \"\"; text: \"Hello World\" }"; QDeclarativeComponent textinputComponent(&engine); textinputComponent.setData(componentStr.toLatin1(), QUrl()); @@ -348,7 +348,7 @@ void tst_qdeclarativetextinput::color() { //test color for (int i = 0; i < colorStrings.size(); i++) - { + { QString componentStr = "import QtQuick 1.0\nTextInput { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QDeclarativeComponent textinputComponent(&engine); textinputComponent.setData(componentStr.toLatin1(), QUrl()); @@ -374,7 +374,7 @@ void tst_qdeclarativetextinput::color() //test selected text color for (int i = 0; i < colorStrings.size(); i++) - { + { QString componentStr = "import QtQuick 1.0\nTextInput { selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QDeclarativeComponent textinputComponent(&engine); textinputComponent.setData(componentStr.toLatin1(), QUrl()); diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml index e2e69627..666dd165 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml +++ b/tests/auto/declarative/qdeclarativevaluetypes/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/declarative/qdeclarativevaluetypes/data/conflicting.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml index 0e09ff95..b7eb04a9 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml +++ b/tests/auto/declarative/qdeclarativevaluetypes/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/declarative/qdeclarativevaluetypes/data/conflicting.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml index 1f6646ea..1788f6dd 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml +++ b/tests/auto/declarative/qdeclarativevaluetypes/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/declarative/qdeclarativeviewer/data/orientation.qml b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml index fb343120..aca16dea 100644 --- a/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml +++ b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml @@ -16,4 +16,4 @@ Rectangle { } color: "white" } -} +} diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index 8f220c9c..2ff0e87a 100644 --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -101,10 +101,10 @@ void tst_QDeclarativeViewer::runtimeContextProperty() QVERIFY(rootItem); QObject *runtimeObject = qvariant_cast<QObject*>(viewer->view()->engine()->rootContext()->contextProperty("runtime")); QVERIFY(runtimeObject); - + // test isActiveWindow property QVERIFY(!runtimeObject->property("isActiveWindow").toBool()); - + viewer->show(); QApplication::setActiveWindow(viewer); //viewer->requestActivateWindow(); @@ -113,7 +113,7 @@ void tst_QDeclarativeViewer::runtimeContextProperty() //QTRY_VERIFY(viewer == qGuiApp->focusWindow()); QVERIFY(runtimeObject->property("isActiveWindow").toBool()); - + TEST_INITIAL_SIZES(viewer); // test orientation property diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp index a8eab7e4..5687f1cd 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp +++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp @@ -189,7 +189,7 @@ void tst_QDeclarativeWorkerScript::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/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml index aeea2789..cf77cdc4 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml index fffc3d9c..1b67547e 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/element.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml index daec9503..c2b67d70 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml index 686e7e5c..8c8938b2 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml index f37545e1..9601597a 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml index 68f22f5f..993c542e 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 1.0 QtObject { property bool onreadystatechange: false diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml index f009ab78..3852f9dc 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml index 86337c43..8c337d93 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/redirects.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml index cd125adf..6903c225 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml index fd1c4247..ecf90448 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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/declarative/qdeclarativexmlhttprequest/data/status.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml index 7aa08743..1819cb03 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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() { @@ -69,11 +69,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/declarative/qdeclarativexmlhttprequest/data/statusText.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml index d42e0cca..6616cb4d 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/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() { @@ -69,11 +69,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/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp index 310e4db1..442645a3 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp @@ -163,7 +163,7 @@ void tst_qdeclarativexmlhttprequest::callbackException() QFETCH(QString, which); QFETCH(int, line); - + QString expect = testFileUrl("callbackException.qml").toString() + ":"+QString::number(line)+": Error: Exception from Callback"; QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); @@ -212,7 +212,7 @@ void tst_qdeclarativexmlhttprequest::instanceStateValues() delete object; } -// Test calling constructor +// Test calling constructor void tst_qdeclarativexmlhttprequest::constructor() { QDeclarativeComponent component(&engine, testFileUrl("constructor.qml")); @@ -443,7 +443,7 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader_sent() component.completeCreate(); QCOMPARE(object->property("test").toBool(), true); - + QTRY_VERIFY(object->property("dataOK").toBool() == true); delete object; @@ -823,7 +823,7 @@ void tst_qdeclarativexmlhttprequest::statusText() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); QVERIFY(server.wait(testFileUrl("status.expect"), - replyUrl, + replyUrl, testFileUrl("testdocument.html"))); QDeclarativeComponent component(&engine, testFileUrl("statusText.qml")); @@ -864,7 +864,7 @@ void tst_qdeclarativexmlhttprequest::responseText() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); QVERIFY(server.wait(testFileUrl("status.expect"), - replyUrl, + replyUrl, bodyUrl)); QDeclarativeComponent component(&engine, testFileUrl("responseText.qml")); @@ -912,7 +912,7 @@ void tst_qdeclarativexmlhttprequest::nonUtf8() QMetaObject::invokeMethod(object, "startRequest"); QTRY_VERIFY(object->property("dataOK").toBool() == true); - + QCOMPARE(object->property("responseText").toString(), responseText); if (!xmlRootNodeValue.isEmpty()) { @@ -1018,10 +1018,10 @@ void tst_qdeclarativexmlhttprequest::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/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index 73c60a4b..3c37f70f 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -494,7 +494,7 @@ void tst_qdeclarativexmllistmodel::source_data() void tst_qdeclarativexmllistmodel::data() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml")); - QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create()); + QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create()); QVERIFY(model != 0); QHash<int,QVariant> blank; @@ -514,7 +514,7 @@ void tst_qdeclarativexmllistmodel::data() void tst_qdeclarativexmllistmodel::get() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml")); - QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create()); + QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create()); QVERIFY(model != 0); QVERIFY(model->get(0).isUndefined()); @@ -563,7 +563,7 @@ void tst_qdeclarativexmllistmodel::reload() QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int))); QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int))); - QSignalSpy spyCount(model, SIGNAL(countChanged())); + QSignalSpy spyCount(model, SIGNAL(countChanged())); //reload multiple times to test the xml query aborting model->reload(); @@ -751,9 +751,9 @@ void tst_qdeclarativexmllistmodel::noKeysValueChanges() QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml")); QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create()); QVERIFY(model != 0); - + QString xml; - + xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics"); model->setXml(xml); QTRY_COMPARE(model->count(), 2); @@ -825,11 +825,11 @@ void tst_qdeclarativexmllistmodel::threading() QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml")); QDeclarativeXmlListModel *m1 = qobject_cast<QDeclarativeXmlListModel*>(component.create()); - QVERIFY(m1 != 0); + QVERIFY(m1 != 0); QDeclarativeXmlListModel *m2 = qobject_cast<QDeclarativeXmlListModel*>(component.create()); - QVERIFY(m2 != 0); + QVERIFY(m2 != 0); QDeclarativeXmlListModel *m3 = qobject_cast<QDeclarativeXmlListModel*>(component.create()); - QVERIFY(m3 != 0); + QVERIFY(m3 != 0); for (int dataCount=0; dataCount<xmlDataCount; dataCount++) { diff --git a/tests/auto/declarative/qmlvisual/ListView/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/basic1.qml index 8c1b56e5..78611379 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic1.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic1.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } model: ListModel { diff --git a/tests/auto/declarative/qmlvisual/ListView/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/basic2.qml index 9d26c737..ece8aafb 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic2.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic2.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/ListView/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/basic3.qml index 982df9a6..cb5b8f71 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic3.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic3.qml @@ -25,7 +25,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/ListView/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/basic4.qml index 2c5d1e3e..837d9b77 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic4.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic4.qml @@ -24,7 +24,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/focusscope/test.qml b/tests/auto/declarative/qmlvisual/focusscope/test.qml index 7342e353..36a6c471 100644 --- a/tests/auto/declarative/qmlvisual/focusscope/test.qml +++ b/tests/auto/declarative/qmlvisual/focusscope/test.qml @@ -19,7 +19,7 @@ Rectangle { focus: true Keys.onDigit9Pressed: console.log("Error - FocusScope") - + Rectangle { height: 120 width: 420 @@ -30,13 +30,13 @@ Rectangle { Rectangle { id: item1 - x: 10; y: 10 + x: 10; y: 10 width: 100; height: 100; color: "green" border.width: 5 border.color: activeFocus?"blue":"black" Keys.onDigit9Pressed: console.log("Top Left"); KeyNavigation.right: item2 - focus: true + focus: true Rectangle { width: 50; height: 50; anchors.centerIn: parent diff --git a/tests/auto/declarative/qmlvisual/focusscope/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/test3.qml index 90c23573..377b03a5 100644 --- a/tests/auto/declarative/qmlvisual/focusscope/test3.qml +++ b/tests/auto/declarative/qmlvisual/focusscope/test3.qml @@ -27,12 +27,12 @@ Rectangle { id: verticalDelegate FocusScope { id: root - width: 50; height: 50; + width: 50; height: 50; Keys.onDigit9Pressed: console.log("Error - " + name) - Rectangle { + Rectangle { focus: true Keys.onDigit9Pressed: console.log(name) - width: 50; height: 50; + width: 50; height: 50; color: root.ListView.isCurrentItem?"black":name } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml index 9335b9e3..ff06c7e1 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml @@ -14,7 +14,7 @@ Item { width: 300 height: 300 color: "blue" - + Flickable { objectName: "flick 2" width: 300 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml index 31712034..252d3636 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml @@ -3,7 +3,7 @@ import QtQuick 1.0 Rectangle { width: 580; height: 220 //Same as test-pathview, but with pathItemCount < model.count - + ListModel { id: rssModel ListElement { lColor: "red" } @@ -24,7 +24,7 @@ Rectangle { scale: wrapper.PathView.scale MouseArea { anchors.fill: parent } - + transform: Rotation { id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2 axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle @@ -39,25 +39,25 @@ Rectangle { pathItemCount: 6 path: Path { startX: -50; startY: 40; - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: -45 } - + PathCubic { x: 300; y: 140 control1X: 90; control1Y: 30 control2X: 140; control2Y: 150 } - + PathAttribute { name: "scale"; value: 1.2 } PathAttribute { name: "angle"; value: 0 } - + PathCubic { x: 600; y: 30 control2X: 440; control2Y: 30 control1X: 420; control1Y: 150 } - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: 45 } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml index 08499e76..25616049 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 Rectangle { width: 580; height: 220 - + ListModel { id: rssModel ListElement { lColor: "red" } @@ -23,7 +23,7 @@ Rectangle { scale: wrapper.PathView.scale MouseArea { anchors.fill: parent } - + transform: Rotation { id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2 axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle @@ -39,25 +39,25 @@ Rectangle { flickDeceleration: 200 path: Path { startX: -50; startY: 40; - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: -45 } - + PathCubic { x: 300; y: 140 control1X: 90; control1Y: 30 control2X: 140; control2Y: 150 } - + PathAttribute { name: "scale"; value: 1.2 } PathAttribute { name: "angle"; value: 0 } - + PathCubic { x: 600; y: 30 control2X: 440; control2Y: 30 control1X: 420; control1Y: 150 } - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: 45 } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml index b5685d1a..e6caf6eb 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml @@ -42,9 +42,9 @@ Item { id: row2 height: childrenRect.height move: Transition{NumberAnimation{properties:"x"}} - Repeater{ - id: repeater - model: 0; + Repeater{ + id: repeater + model: 0; delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}} } Rectangle{id: r2a; width:20; height:20; color: "red"} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml index 17709ba9..3e2213a9 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml @@ -6,7 +6,7 @@ Item { property alias text: textEdit.text width: 240 + 11 //Should be set manually in most cases - height: textEdit.height + 11 + height: textEdit.height + 11 Rectangle { color: 'lightsteelblue' @@ -25,10 +25,10 @@ Item { y: 1 } } - property int leftMargin: 6 - property int topMargin: 6 - property int rightMargin: 6 - property int bottomMargin: 6 + property int leftMargin: 6 + property int topMargin: 6 + property int rightMargin: 6 + property int bottomMargin: 6 x: leftMargin width: parent.width - leftMargin - rightMargin; y: 5 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml index 6789eac2..4218d442 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml @@ -5,8 +5,8 @@ Item { id:lineedit property alias text: textInp.text - width: textInp.width + 11 - height: 13 + 11 + width: textInp.width + 11 + height: 13 + 11 Rectangle { color: 'lightsteelblue' @@ -25,8 +25,8 @@ Item { y: 1 } } - property int leftMargin: 6 - property int rightMargin: 6 + property int leftMargin: 6 + property int rightMargin: 6 x: leftMargin y: 5 //Below function implements all scrolling logic diff --git a/tests/auto/declarative/qmlvisual/repeater/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/basic1.qml index 5d994b96..bf11a42a 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic1.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic1.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } model: ListModel { diff --git a/tests/auto/declarative/qmlvisual/repeater/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/basic2.qml index ea14e92e..0a7d4d7f 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic2.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic2.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/repeater/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/basic3.qml index 0193db30..7052b23e 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic3.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic3.qml @@ -25,7 +25,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/repeater/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/basic4.qml index c7c0d296..4f45d013 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic4.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic4.qml @@ -24,7 +24,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp index 14a09d96..2802f9bb 100644 --- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp +++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp @@ -178,7 +178,7 @@ QString tst_qmlvisual::toTestScript(const QString &file, Mode mode) platformsuffix = "-X11"; #endif - QString testdata = file.left(index + 1) + + QString testdata = file.left(index + 1) + QString("data"); QString testname = file.mid(index + 1, file.length() - index - 5); @@ -216,7 +216,7 @@ QStringList tst_qmlvisual::findQmlFiles(const QDir &d) { QStringList rv; - QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"), + QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"), QDir::Files); foreach (const QString &file, files) { if (file.at(0).isLower()) { @@ -224,7 +224,7 @@ QStringList tst_qmlvisual::findQmlFiles(const QDir &d) } } - QStringList dirs = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot | + QStringList dirs = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); foreach (const QString &dir, dirs) { if (dir.left(4) == "data") @@ -389,7 +389,7 @@ int main(int argc, char **argv) } else { newArgv[newArgc++] = argv[ii]; } - + if (arg == "-help" || arg == "-?" || arg == "--help") { atexit(usage); showHelp = true; diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp index dc8fbd57..ee1b1ec8 100644 --- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp +++ b/tests/auto/declarative/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()); m_serverConn = m_server->nextPendingConnection(); diff --git a/tests/auto/declarative/shared/testhttpserver.cpp b/tests/auto/declarative/shared/testhttpserver.cpp index 461e0e70..8acd240d 100644 --- a/tests/auto/declarative/shared/testhttpserver.cpp +++ b/tests/auto/declarative/shared/testhttpserver.cpp @@ -126,7 +126,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; @@ -300,7 +300,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; @@ -317,7 +317,7 @@ void TestHTTPServer::serveGET(QTcpSocket *socket, const QByteArray &data) } dataCache.remove(socket); - if (close) + if (close) socket->disconnectFromHost(); } } |