diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data')
375 files changed, 0 insertions, 6408 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsAssignCorrectlyType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsAssignCorrectlyType.qml deleted file mode 100644 index e8e108fa44..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsAssignCorrectlyType.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property real realProperty - property alias aliasProperty: root.realProperty -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType.qml deleted file mode 100644 index 062772106b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyTypeObject { - id: root - - property int data: 7 - - property int targetProperty: root.data * 43 - root.data - property alias aliasProperty: root.targetProperty - - pointProperty: Qt.point(data, data); - property alias pointAliasProperty: root.pointProperty -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType3.qml deleted file mode 100644 index 823c0ef367..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType3.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property int testProperty - property alias aliasProperty: root.testProperty -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml deleted file mode 100644 index cef8ae09ea..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property alias group: obj - property variant foo: AliasToCompositeElementType2 { id: obj } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml deleted file mode 100644 index 4a45535a50..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int value -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml deleted file mode 100644 index 07bb16b0d8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property int c1: 0 - property int c2: c1 - property alias c3: inner.ic1 - - objectProperty: MyQmlObject { - id: inner - property int ic1: c1 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml deleted file mode 100644 index aa1a1d6061..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string greeting: "hello world" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml deleted file mode 100644 index 4a45535a50..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int value -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml deleted file mode 100644 index eaca0a7f92..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -QtObject { - function testFunction() { return 19; } - function testFunction2() { return 18; } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml deleted file mode 100644 index 3b3e84a900..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int b: obj.prop.a - - property variant prop; - prop: QtObject { - property int a: 10 - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarBaseItem.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarBaseItem.qml deleted file mode 100644 index 5f28833fe7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarBaseItem.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - property var random: null -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent.qml deleted file mode 100644 index 36c025401f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: first - property var vp: Item { - id: second - property var vp: Item { - id: third - property var vp: Item { - id: fourth - property var vp: Item { - id: fifth - property int fifthCanary: 5 - property var circ: third.vp - property MyScarceResourceObject srp; - srp: MyScarceResourceObject { id: scarceResourceProvider } - property variant memoryHog: scarceResourceProvider.newScarceResource() - } - } - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent2.qml deleted file mode 100644 index 6a49cb9317..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent2.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// Similar to PVCC.qml except that it has another var property -// It will have a different metaobject. -Item { - id: first - property var anotherVp: 6 - property var vp: Item { - id: second - property var vp: Item { - id: third - property var vp: Item { - id: fourth - property var vp: Item { - id: fifth - property int fifthCanary: 5 - property var circ: third.vp - property MyScarceResourceObject srp; - srp: MyScarceResourceObject { id: scarceResourceProvider } - property variant memoryHog2: scarceResourceProvider.newScarceResource() - } - } - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent3.qml deleted file mode 100644 index a90725016e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent3.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - id: rectangle // will have JS ownership - objectName: "rectangle" - width: 10 - height: 10 - property var rectCanary: 5 - - Text { - id: text // will have Eventual-JS ownership - objectName: "text" - property var vp: rectangle - property var textCanary: 10 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent4.qml deleted file mode 100644 index 9273a52f54..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent4.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - id: rectangle // will have JS ownership - objectName: "rectangle" - width: 10 - height: 10 - property var rectCanary: 5 - - Text { - id: text // will have Eventual-JS ownership - objectName: "text" - property var vp - property var textCanary: 10 - - // The varProperties array of "text" is weak - // (due to eventual JS ownership since parent is JS owned) - // but nonetheless, the reference to the created QObject - // should cause that QObject to NOT be collected. - function constructQObject() { - var component = Qt.createComponent("PropertyVarCircularComponent5.qml"); - if (component.status == Component.Ready) { - text.vp = component.createObject(null); // has JavaScript ownership - } - gc(); - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent5.qml deleted file mode 100644 index 94ef338792..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent5.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -Image { - id: image - objectName: "image" - property var imageCanary: 13 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarInheritanceComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarInheritanceComponent.qml deleted file mode 100644 index b01cf6ed84..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarInheritanceComponent.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -PropertyVarCircularComponent { - id: inheritanceComponent - property int inheritanceIntProperty: 6 - property var inheritanceVarProperty - - function constructGarbage() { - var retn = 1; - var component = Qt.createComponent("PropertyVarCircularComponent2.qml"); - if (component.status == Component.Ready) { - retn = component.createObject(null); // has JavaScript ownership - } - return retn; - } - - Component.onCompleted: { - inheritanceVarProperty = constructGarbage(); - gc(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarOwnershipComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarOwnershipComponent.qml deleted file mode 100644 index c1f73d3bac..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarOwnershipComponent.qml +++ /dev/null @@ -1,37 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - id: rectangle // will have JS ownership - objectName: "rectangle" - width: 10 - height: 10 - property var rectCanary: 5 - - Text { - id: textOne // will have Eventual-JS ownership - objectName: "textOne" - property var textCanary: 11 - property var vp - } - - Text { - id: textTwo - objectName: "textTwo" - property var textCanary: 12 - property var vp - - function constructQObject() { - var component = Qt.createComponent("PropertyVarCircularComponent5.qml"); - if (component.status == Component.Ready) { - textTwo.vp = component.createObject(null); // has JavaScript ownership - } - gc(); - } - - function deassignVp() { - textTwo.textCanary = 22; - textTwo.vp = textTwo.textCanary; - gc(); - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceSignalComponentVar.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceSignalComponentVar.qml deleted file mode 100644 index d56bd41a99..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceSignalComponentVar.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property var scarceResourceCopy - property int width: 5 - signal testSignal - signal testSignal2 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceSignalComponentVariant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceSignalComponentVariant.qml deleted file mode 100644 index e10fcfe36a..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceSignalComponentVariant.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant scarceResourceCopy - property int width: 5 - signal testSignal - signal testSignal2 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceVarComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceVarComponent.qml deleted file mode 100644 index 2cf6b4223b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/ScarceResourceVarComponent.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: first - property var vp: Item { - id: second - property MyScarceResourceObject srp; - srp: MyScarceResourceObject { id: scarceResourceProvider } - property var sr: scarceResourceProvider.scarceResource - property var canary: 5 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/Scope6Nested.qml b/tests/auto/declarative/qdeclarativeecmascript/data/Scope6Nested.qml deleted file mode 100644 index a3794df22b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/Scope6Nested.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - function runtest(obj) { - return obj.MyQmlObject.value == 19; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml deleted file mode 100644 index f341cce3c9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -Item { - property int a: 3 - property int binding: myFunction(); - property int binding2: myCompFunction(); - - function myCompFunction() { - return a; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/SequenceConversionComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/SequenceConversionComponent.qml deleted file mode 100644 index 0c7f60b062..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/SequenceConversionComponent.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MySequenceConversionObject { - id: sccmsco - objectName: "sccmsco" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml b/tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml deleted file mode 100644 index f6398d254d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - property int children: root.children.length -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml deleted file mode 100644 index 56e06252c4..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml +++ /dev/null @@ -1,2 +0,0 @@ -import Qt.test 1.0 -MyQmlObject{objectName:"objectThree"} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml deleted file mode 100644 index ff6c553c31..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml +++ /dev/null @@ -1,59 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - - property bool test: false - - property real testData: 9 - property real testData2: 9 - - states: State { - name: "change" - PropertyChanges { - target: myType - realProperty: if (testData2 > 3) 9; else 11; - } - } - - AliasBindingsAssignCorrectlyType { - id: myType - - aliasProperty: if (testData > 3) 14; else 12; - } - - Component.onCompleted: { - // Check original binding works - if (myType.aliasProperty != 14) return; - - testData = 2; - if (myType.aliasProperty != 12) return; - - // Change binding indirectly by modifying the "realProperty" - root.state = "change"; - if (myType.aliasProperty != 9) return; - - // Check the new binding works - testData2 = 1; - if (myType.aliasProperty != 11) return; - - // Try and trigger the old binding (that should have been removed) - testData = 6; - if (myType.aliasProperty != 11) return; - - // Restore the original binding - root.state = ""; - if (myType.aliasProperty != 14) return; - - // Test the restored binding works - testData = 0; - if (myType.aliasProperty != 12) return; - - // Test the old binding isn't somehow hanging around and still in effect - testData2 = 13; - if (myType.aliasProperty != 12) return; - - test = true; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.2.qml deleted file mode 100644 index bba9033235..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.2.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0 - -Item { - id: me - property bool test: false - - property int value: 9 - - AliasBindingsOverrideTargetType { - id: aliasType - pointAliasProperty.x: me.value - } - - Component.onCompleted: { - if (aliasType.pointAliasProperty.x != 9) return; - - me.value = 11; - if (aliasType.pointAliasProperty.x != 11) return; - - aliasType.data = 8; - if (aliasType.pointAliasProperty.x != 11) return; - - me.value = 4; - if (aliasType.pointAliasProperty.x != 4) return; - - test = true; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.3.qml deleted file mode 100644 index 3e4cda6ba3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.3.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - property bool test: false; - - property int value1: 10 - property int value2: 11 - - AliasBindingsOverrideTargetType3 { - id: obj - - testProperty: root.value1 * 9 - aliasProperty: root.value2 * 10 - } - - Component.onCompleted: { - if (obj.testProperty != 110) return; - if (obj.aliasProperty != 110) return; - - test = true; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.qml deleted file mode 100644 index de5f49ffc5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 2.0 - -Item { - id: me - property bool test: false - - property int value: 9 - - AliasBindingsOverrideTargetType { - id: aliasType - aliasProperty: me.value - } - - Component.onCompleted: { - if (aliasType.aliasProperty != 9) return; - - me.value = 11; - if (aliasType.aliasProperty != 11) return; - - aliasType.data = 8; - if (aliasType.aliasProperty != 11) return; - - me.value = 4; - if (aliasType.aliasProperty != 4) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml deleted file mode 100644 index f228b2c19f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -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 c1 - } -} - - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml deleted file mode 100644 index 79d6e6887c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -AliasToCompositeElementType1 { - group.value: 13 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.2.qml deleted file mode 100644 index b5bc280d11..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.2.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0 - -Item { - id: me - property bool test: false - - property int value: 9 - - AliasBindingsOverrideTargetType { - id: aliasType - } - - Component.onCompleted: { - if (aliasType.aliasProperty != 294) return; - - aliasType.data = 8; - if (aliasType.aliasProperty != 336) return; - - aliasType.aliasProperty = 4; - if (aliasType.aliasProperty != 4) return; - - aliasType.data = 7; - if (aliasType.aliasProperty != 4) return; - - test = true; - } -} - - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.3.qml deleted file mode 100644 index 6c16ff5604..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.3.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 - -Item { - id: me - property bool test: false - - property int value: 9 - - AliasBindingsOverrideTargetType { - id: aliasType - pointAliasProperty.x: 9 - } - - Component.onCompleted: { - if (aliasType.pointAliasProperty.x != 9) return; - - aliasType.data = 8; - if (aliasType.pointAliasProperty.x != 9) return; - - test = true; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.qml deleted file mode 100644 index 441098bd39..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 - -Item { - id: me - property bool test: false - - property int value: 9 - - AliasBindingsOverrideTargetType { - id: aliasType - aliasProperty: 11 - } - - Component.onCompleted: { - if (aliasType.aliasProperty != 11) return; - - aliasType.data = 8; - if (aliasType.aliasProperty != 11) return; - - test = true; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/AliasPropertyComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/AliasPropertyComponent.qml deleted file mode 100644 index 9135e79469..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/AliasPropertyComponent.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 - -Item { - id: apc - property alias sourceComponent: loader.sourceComponent - - Component { - id: redSquare - Rectangle { color: "red"; width: 10; height: 10 } - } - - Loader { - id: loader - objectName: "loader" - sourceComponent: redSquare - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml deleted file mode 100644 index b855a183ee..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: first - property bool aliasIsUndefined: false - property alias sourceComponentAlias: loader.sourceComponent - - Component { - id: redSquare - Rectangle { color: "red"; width: 10; height: 10 } - } - - Loader { - id: loader - sourceComponent: redSquare - } - - function resetAliased() { - loader.sourceComponent = undefined; - aliasIsUndefined = (sourceComponentAlias == undefined); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml deleted file mode 100644 index b0bb3681cf..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: first - property bool loaderSourceComponentIsUndefined: false - property alias sourceComponentAlias: loader.sourceComponent - - Component { - id: redSquare - Rectangle { color: "red"; width: 10; height: 10 } - } - - Loader { - id: loader - sourceComponent: redSquare - } - - function resetAlias() { - sourceComponentAlias = undefined; - loaderSourceComponentIsUndefined = (loader.sourceComponent == undefined); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml deleted file mode 100644 index b318af0138..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml +++ /dev/null @@ -1,31 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: first - property bool loaderTwoSourceComponentIsUndefined: false - property bool loaderOneSourceComponentIsUndefined: false - property alias sourceComponentAlias: loaderOne.sourceComponent - - Component { - id: redSquare - Rectangle { color: "red"; width: 10; height: 10 } - } - - Loader { - id: loaderOne - sourceComponent: loaderTwo.sourceComponent - } - - Loader { - id: loaderTwo - sourceComponent: redSquare - x: 15 - } - - function resetAlias() { - sourceComponentAlias = undefined; // loaderOne.sourceComponent should be set to undefined instead of l2.sc - loaderOneSourceComponentIsUndefined = (loaderOne.sourceComponent == undefined); // should be true - loaderTwoSourceComponentIsUndefined = (loaderTwo.sourceComponent == undefined); // should be false - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml deleted file mode 100644 index c5f56a8798..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: first - property alias sourceComponentAlias: loader.sourceComponent - - Component { - id: redSquare - Rectangle { color: "red"; width: 10; height: 10 } - } - - Loader { - id: loader - objectName: "loader" - sourceComponent: redSquare - } - - function resetAlias() { - sourceComponentAlias = undefined; // ensure we don't crash after deletion of loader. - } - - function setAlias() { - sourceComponentAlias = redSquare; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml deleted file mode 100644 index b07db8ba40..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - - AliasPropertyComponent { - sourceComponent: returnsUndefined() - } - - function returnsUndefined() { - return undefined; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml deleted file mode 100644 index 35c9d6fd5d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - id: first - property bool aliasedIntIsUndefined: false - property alias intAlias: objprop.intp - - objectProperty: QtObject { - id: objprop - property int intp: 12 - } - - function resetAlias() { - intAlias = undefined; // should error - aliasedIntIsUndefined = (objprop.intp == undefined); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml deleted file mode 100644 index 2c79729651..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml +++ /dev/null @@ -1,26 +0,0 @@ -import Qt.test 1.0 - -MyTypeObject { - flagProperty: if(1) "FlagVal1 | FlagVal3" - enumProperty: if(1) "EnumVal2" - stringProperty: if(1) "Hello World!" - uintProperty: if(1) 10 - intProperty: if(1) -19 - realProperty: if(1) 23.2 - doubleProperty: if(1) -19.75 - floatProperty: if(1) 8.5 - colorProperty: if(1) "red" - dateProperty: if(1) "1982-11-25" - 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" - sizeProperty: if(1) "99x13" - sizeFProperty: if(1) "0.1x0.2" - rectProperty: if(1) "9,7,100x200" - rectFProperty: if(1) "1000.1,-10.9,400x90.99" - boolProperty: if(1) true - variantProperty: if(1) "Hello World!" - vectorProperty: if(1) "10,1,2.2" - urlProperty: if(1) "main.qml" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml deleted file mode 100644 index 86ff6b6bb3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml +++ /dev/null @@ -1,29 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyTypeObject { - Component.onCompleted: { - flagProperty = "FlagVal1 | FlagVal3" - enumProperty = "EnumVal2" - stringProperty = "Hello World!" - uintProperty = 10 - intProperty = -19 - realProperty = 23.2 - doubleProperty = -19.75 - floatProperty = 8.5 - colorProperty = "red" - dateProperty = "1982-11-25" - timeProperty = "11:11:32" - dateTimeProperty = "2009-05-12T13:22:01" - pointProperty = "99,13" - pointFProperty = "-10.1,12.3" - sizeProperty = "99x13" - sizeFProperty = "0.1x0.2" - rectProperty = "9,7,100x200" - rectFProperty = "1000.1,-10.9,400x90.99" - boolProperty = true - variantProperty = "Hello World!" - vectorProperty = "10,1,2.2" - urlProperty = "main.qml" - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.1.qml deleted file mode 100644 index be283fdda1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.1.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MySequenceConversionObject { - intListProperty: [1, 2] - qrealListProperty: [1.1, 2.2] - boolListProperty: [false, true] - urlListProperty: [ "http://www.example1.com", "http://www.example2.com" ] - stringListProperty: [ "one", "two" ] - qstringListProperty: [ "one", "two" ] -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.2.qml deleted file mode 100644 index c8fb28b04e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.2.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MySequenceConversionObject { - intListProperty: 1 - qrealListProperty: 1.1 - boolListProperty: false - urlListProperty: "http://www.example1.com" - stringListProperty: "one" - qstringListProperty: "two" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.3.qml deleted file mode 100644 index ad8a92e317..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.3.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MySequenceConversionObject { - intListProperty: 1 - qrealListProperty: 1.1 - boolListProperty: false - urlListProperty: Qt.resolvedUrl("example.html") -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.4.qml deleted file mode 100644 index a9f2e642d1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.4.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MySequenceConversionObject { - Component.onCompleted: { - intListProperty = [1, 2] - qrealListProperty = [1.1, 2.2] - boolListProperty = [false, true] - urlListProperty = [ "http://www.example1.com", "http://www.example2.com" ] - stringListProperty = [ "one", "two" ] - qstringListProperty = [ "one", "two" ] - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.5.qml deleted file mode 100644 index b8697e4290..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.5.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MySequenceConversionObject { - Component.onCompleted: { - intListProperty = 1; - qrealListProperty = 1.1; - boolListProperty = false; - urlListProperty = "http://www.example1.com"; - stringListProperty = "one"; - qstringListProperty = "two"; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.6.qml deleted file mode 100644 index 7a794eb694..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.6.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MySequenceConversionObject { - Component.onCompleted: { - intListProperty = 1; - qrealListProperty = 1.1; - boolListProperty = false; - urlListProperty = Qt.resolvedUrl("example.html"); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.7.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.7.qml deleted file mode 100644 index 96c0684939..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/assignSequenceTypes.7.qml +++ /dev/null @@ -1,42 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - // single url assignment to url list property - MySequenceConversionObject { - id: msco1 - objectName: "msco1" - } - - // single url binding to url list property - MySequenceConversionObject { - id: msco2 - objectName: "msco2" - urlListProperty: "example.html" - } - - // multiple url assignment to url list property - MySequenceConversionObject { - id: msco3 - objectName: "msco3" - } - - // multiple url binding to url list property - MySequenceConversionObject { - id: msco4 - objectName: "msco4" - urlListProperty: [ "example.html", "example2.html" ] - } - - // multiple url binding to url list property - already resolved - MySequenceConversionObject { - id: msco5 - objectName: "msco5" - urlListProperty: [ Qt.resolvedUrl("example.html"), Qt.resolvedUrl("example2.html") ] - } - - Component.onCompleted: { - msco1.urlListProperty = "example.html"; - msco3.urlListProperty = [ "example.html", "example2.html" ]; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.2.qml deleted file mode 100644 index a7184c9200..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.2.qml +++ /dev/null @@ -1,22 +0,0 @@ -import Qt.test 1.0 -import Qt.test 1.0 as Namespace - -MyQmlObject { - property alias a: me.a - property alias b: me.a - property alias c: me.a - property alias d: me.a - - property MyQmlObject obj - obj: MyQmlObject { - MyQmlObject.value2: 13 - - id: me - property int a: MyQmlObject.value2 * 2 - property int b: Namespace.MyQmlObject.value2 * 2 - property int c: me.Namespace.MyQmlObject.value * 2 - property int d: me.Namespace.MyQmlObject.value * 2 - } -} - - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml deleted file mode 100644 index 061eda0e54..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 -import Qt.test 1.0 as Namespace - -MyQmlObject { - id: me - property int a: MyQmlObject.value - property int b: Namespace.MyQmlObject.value - property int c: me.Namespace.MyQmlObject.value - property int d: me.Namespace.MyQmlObject.value -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml deleted file mode 100644 index 11fb7ccad2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -QtObject { - property int value: 9 - property int value2 - - MyQmlObject.onMySignal: value2 = value -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/automaticSemicolon.qml b/tests/auto/declarative/qdeclarativeecmascript/data/automaticSemicolon.qml deleted file mode 100644 index 6db68f2328..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/automaticSemicolon.qml +++ /dev/null @@ -1,11 +0,0 @@ - -import QtQuick 2.0 - -QtObject { - function code() { - if (1) { - var a; - function f1(){}a=1; - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml deleted file mode 100644 index 80545cf72b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.0 - -MyQmlContainer { - children : [ - MyQmlObject { - id: object1 - stringProperty: "hello" + object2.stringProperty - }, - MyQmlObject { - id: object2 - stringProperty: "hello" + object1.stringProperty - } - ] -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/blank.js b/tests/auto/declarative/qdeclarativeecmascript/data/blank.js deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/blank.js +++ /dev/null diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml deleted file mode 100644 index 3147f63989..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -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 deleted file mode 100644 index c89bb49b45..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - stringProperty: falseProperty?'fail':'pass' -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml b/tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml deleted file mode 100644 index a363cf4dd1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property bool test_true1: false - property bool test_true2: false - property bool test_true3: false - property bool test_true4: false - property bool test_true5: false - - property bool test_false1: true - property bool test_false2: true - property bool test_false3: true - - - Component.onCompleted: { - test_true1 = 11 - test_true2 = "Hello" - test_true3 = root - test_true4 = { a: 10, b: 11 } - test_true5 = true - - test_false1 = 0 - test_false2 = null - test_false3 = false - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml deleted file mode 100644 index 31f7c44fcc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int a: 10 - property bool b: false - - property int test - - test: ((a == 10)?(a + 1):0) + ((b == true)?9:3) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.1.qml deleted file mode 100644 index 3fd9131b2f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.1.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property bool runTest: false - - property variant a: MyQmlObject {} - - objectProperty: (runTest == false)?a:null -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml deleted file mode 100644 index 3fbf931fca..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - objectProperty: MyQmlObject {} - - Component.onCompleted: { - objectProperty = null; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.1.qml deleted file mode 100644 index 1e92aca825..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.1.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -Item { - property int changeCount: 0 - - property bool _nameWithUnderscore: false - - // this should error, since the first alpha isn't capitalised. - on_nameWithUnderscoreChanged: { - changeCount = changeCount + 2; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.2.qml deleted file mode 100644 index 3549d8c556..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.2.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -Item { - property int changeCount: 0 - - property bool ____nameWithUnderscores: false - - // this should error, since the first alpha isn't capitalised - on____nameWithUnderscoresChanged: { - changeCount = changeCount + 3; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.3.qml deleted file mode 100644 index d611e0fe30..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.3.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -Item { - property int changeCount: 0 - - // invalid property name - we don't allow $ - property bool $nameWithDollarsign: false - - on$NameWithDollarsignChanged: { - changeCount = changeCount + 4; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.4.qml deleted file mode 100644 index a6862517c6..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.4.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -Item { - property int changeCount: 0 - - property bool _6nameWithUnderscoreNumber: false - - // invalid property name - the first character after an underscore must be a letter - on_6NameWithUnderscoreNumberChanged: { - changeCount = changeCount + 3; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlots.qml b/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlots.qml deleted file mode 100644 index f91fb71f1f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlots.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 - -Item { - property int changeCount: 0 - - property bool normalName: false - property bool _nameWithUnderscore: false - property bool ____nameWithUnderscores: false - - onNormalNameChanged: { - changeCount = changeCount + 1; - } - - on_NameWithUnderscoreChanged: { - changeCount = changeCount + 2; - } - - on____NameWithUnderscoresChanged: { - changeCount = changeCount + 3; - } - - Component.onCompleted: { - normalName = true; - _nameWithUnderscore = true; - ____nameWithUnderscores = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml deleted file mode 100644 index 7c46306772..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml +++ /dev/null @@ -1,48 +0,0 @@ -import QtQuick 2.0 - -QtObject { - //real - property real test1: a + b - property real test2: a - b - property bool test3: (a < b) - property bool test4: (a > b) - property bool test5: (a == b) - property bool test6: (a != b) - - //int - property int test7: c + d - property int test8: d - c - property bool test9: (c < d) - property bool test10: (c > d) - property bool test11: (c == d) - property bool test12: (c != d) - - //string - property string test13: e + f - property string test14: e + " " + f - property bool test15: (e == f) - property bool test16: (e != f) - - //type conversion - property int test17: a - property real test18: d - property int test19: g - property real test20: g - property string test21: g - property string test22: h - property bool test23: i - property color test24: j - property color test25: k - - property real a: 4.5 - property real b: 11.2 - property int c: 9 - property int d: 176 - property string e: "Hello" - property string f: "World" - property variant g: 6.7 - property variant h: "!" - property variant i: true - property string j: "#112233" - property string k: "#aa112233" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml deleted file mode 100644 index e97b75c8d0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property CustomObject myObject - myObject: CustomObject { } - - Component.onCompleted: console.log(myObject.greeting) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml deleted file mode 100644 index 13c5ae5fff..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property int c1: 0 - property int c2: c1 - - onBasicSignal: c2 = 13 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml deleted file mode 100644 index 207a06b700..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property alias c1: myConstants.c1 - property alias c2: myConstants.c2 - - objectProperty: ConstantsOverrideBindings { - id: myConstants - c2: 10 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml deleted file mode 100644 index ca9d1d8ab9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property int c1: 0 - property int c2: c1 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml deleted file mode 100644 index 5a2091f71c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property alias c1: myConstants.c1 - property alias c3: myConstants.c3 - - objectProperty: ConstantsOverrideBindings { - id: myConstants - c3: 10 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/declarativeHasOwnProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/declarativeHasOwnProperty.qml deleted file mode 100644 index 12598b3b9f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/declarativeHasOwnProperty.qml +++ /dev/null @@ -1,72 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import Qt.test.qobjectApi 1.0 as QtTestQObjectApi - -Item { - id: obj - objectName: "objName" - property int someIntProperty: 10 - property bool result: false - - function testHasOwnPropertySuccess() - { - obj.result = obj.hasOwnProperty("someIntProperty"); - } - - function testHasOwnPropertyFailure() - { - obj.result = obj.hasOwnProperty("someNonexistentProperty"); - } - - MyTypeObject { - id: typeObj - objectName: "typeObj" - pointProperty: Qt.point(34, 29) - variantProperty: Qt.vector3d(1, 2, 3) - stringProperty: "test string" - property list<Rectangle> listProperty: [ Rectangle { width: 10; height: 10 } ] - property list<Rectangle> emptyListProperty - - property bool valueTypeHasOwnProperty - property bool valueTypeHasOwnProperty2 - property bool variantTypeHasOwnProperty - property bool stringTypeHasOwnProperty - property bool listTypeHasOwnProperty - property bool listAtValidHasOwnProperty - property bool emptyListTypeHasOwnProperty - property bool enumTypeHasOwnProperty - property bool typenameHasOwnProperty - property bool typenameHasOwnProperty2 - property bool moduleApiTypeHasOwnProperty - property bool moduleApiPropertyTypeHasOwnProperty - function testHasOwnPropertySuccess() { - valueTypeHasOwnProperty = !typeObj.pointProperty.hasOwnProperty("nonexistentpropertyname"); - valueTypeHasOwnProperty2 = typeObj.pointProperty.hasOwnProperty("x"); // should be true - variantTypeHasOwnProperty = !typeObj.variantProperty.hasOwnProperty("nonexistentpropertyname"); - stringTypeHasOwnProperty = !typeObj.stringProperty.hasOwnProperty("nonexistentpropertyname"); - listTypeHasOwnProperty = !typeObj.listProperty.hasOwnProperty("nonexistentpropertyname"); - listAtValidHasOwnProperty = !typeObj.listProperty[0].hasOwnProperty("nonexistentpropertyname"); - emptyListTypeHasOwnProperty = !typeObj.emptyListProperty.hasOwnProperty("nonexistentpropertyname"); - enumTypeHasOwnProperty = !MyTypeObject.EnumVal1.hasOwnProperty("nonexistentpropertyname"); - typenameHasOwnProperty = !MyTypeObject.hasOwnProperty("nonexistentpropertyname"); - typenameHasOwnProperty2 = MyTypeObject.hasOwnProperty("EnumVal1"); // should be true. - moduleApiTypeHasOwnProperty = !QtTestQObjectApi.hasOwnProperty("nonexistentpropertyname"); - moduleApiPropertyTypeHasOwnProperty = !QtTestQObjectApi.qobjectTestProperty.hasOwnProperty("nonexistentpropertyname"); - } - - property bool enumNonValueHasOwnProperty - function testHasOwnPropertyFailureOne() { - enumNonValueHasOwnProperty = !MyTypeObject.NonexistentEnumVal.hasOwnProperty("nonexistentpropertyname"); - } - - property bool moduleApiNonPropertyHasOwnProperty - function testHasOwnPropertyFailureTwo() { - moduleApiNonPropertyHasOwnProperty = !QtTestQObjectApi.someNonexistentProperty.hasOwnProperty("nonexistentpropertyname"); - } - - property bool listAtInvalidHasOwnProperty - function testHasOwnPropertyFailureThree() { - listAtInvalidHasOwnProperty = !typeObj.listProperty[5].hasOwnProperty("nonexistentpropertyname"); - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/declarativeToString.qml b/tests/auto/declarative/qdeclarativeecmascript/data/declarativeToString.qml deleted file mode 100644 index ac296ce293..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/declarativeToString.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject{ - id: obj - objectName: "objName" - function testToString() - { - obj.stringProperty = obj.toString(); - } - -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml deleted file mode 100644 index e01f708a07..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Qt.test 1.0 - -MyDeferredObject { - id: root - value: 10 - objectProperty: MyQmlObject { - value: root.value - } - objectProperty2: MyQmlObject { id: blah } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml deleted file mode 100644 index 308a01ce6f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyDeferredObject { - value: undefined // error is resolved before complete - objectProperty: undefined // immediate error - objectProperty2: QtObject { - Component.onCompleted: value = 10 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml deleted file mode 100644 index 2a9ce44b20..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - property bool test: false - - Component.onCompleted: { - try { - root.deleteLater() - } catch(e) { - test = true; - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deleteWhileBindingRunning.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deleteWhileBindingRunning.qml deleted file mode 100644 index b5cc59e2c0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deleteWhileBindingRunning.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyDeleteObject { - property int result: nestedObject.intProperty + deleteNestedObject -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml deleted file mode 100644 index 97acddf5fc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -QtObject { - function calculate() { - return b * 13; - } - - property int a: calculate() - property int b: 3 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml deleted file mode 100644 index 24c12bf694..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml +++ /dev/null @@ -1,25 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -QtObject { - property variant obj - obj: MyQmlObject { - id: myObject - value: 92 - } - - property bool test1: false - property bool test2: false - property bool test3: false - property bool test4: false - - Component.onCompleted: { - test1 = myObject.value == 92; - test2 = obj.value == 92; - - myObject.deleteOnSet = 1; - - test3 = myObject == null - test4 = obj == null - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/doubleEvaluate.qml b/tests/auto/declarative/qdeclarativeecmascript/data/doubleEvaluate.qml deleted file mode 100644 index 0532715432..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/doubleEvaluate.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -WriteCounter { - property int x: 0 - value: if (1) x + x -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml deleted file mode 100644 index d790d634e9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject{ - objectName: "objectTwo" -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml deleted file mode 100644 index 7b132e1edf..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml +++ /dev/null @@ -1,27 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject{ - id: obj - objectName: "obj" - function createOne() - { - obj.objectProperty = Qt.createQmlObject('import Qt.test 1.0; MyQmlObject{objectName:"objectOne"}', obj); - } - - function createTwo() - { - var component = Qt.createComponent('dynamicCreation.helper.qml'); - obj.objectProperty = component.createObject(obj); - } - - function createThree() - { - obj.objectProperty = Qt.createQmlObject('TypeForDynamicCreation{}', obj); - } - - function dontCrash() - { - var component = Qt.createComponent('file-doesnt-exist.qml'); - obj.objectProperty = component.createObject(obj); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreationOwnership.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreationOwnership.qml deleted file mode 100644 index ed396d49b0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreationOwnership.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: obj - objectName: "obj" - - MyDynamicCreationDestructionObject { - id: mdcdo - objectName: "mdcdo" - } - - function dynamicallyCreateJsOwnedObject() { - mdcdo.createNew(); - } - - function performGc() { - gc(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml deleted file mode 100644 index 9a5732c194..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property QtObject objectProperty - - property Component c: Component { - id: componentObject - QtObject { - } - } - - function create() { - objectProperty = c.createObject(root); - } - - function destroy() { - objectProperty.destroy(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml deleted file mode 100644 index f41e5262fd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml +++ /dev/null @@ -1,20 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject{ - id: obj - objectName: "obj" - function create() - { - obj.objectProperty = Qt.createQmlObject('import Qt.test 1.0; MyQmlObject{objectName:"emptyObject"}', obj); - } - - function killOther() - { - obj.objectProperty.destroy(500); - } - - function killMe() - { - obj.destroy();//Must not segfault - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicString.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicString.qml deleted file mode 100644 index 5693794c71..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicString.qml +++ /dev/null @@ -1,16 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyTypeObject { - stringProperty:"string:%0 false:%1 true:%2 uint32:%3 int32:%4 double:%5 date:%6!" - Component.onCompleted: { - var date = new Date(); - date.setDate(11); - date.setMonth(1); - date.setFullYear(2011); - date.setHours(5); - date.setMinutes(30); - date.setSeconds(50); - stringProperty = stringProperty.arg("Hello World").arg(false).arg(true).arg(100).arg(-100).arg(3.1415926).arg(Qt.formatDateTime(date, "yyyy-MM-dd hh::mm:ss")); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml b/tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml deleted file mode 100644 index 0d75cbf6fc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property bool test: bound.value == 1923 - - property ElementAssignType element: ElementAssignType { value: 1923 } - property ElementAssignType bound: root.element -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml deleted file mode 100644 index 6351823230..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml +++ /dev/null @@ -1,20 +0,0 @@ -import Qt.test 1.0 -import Qt.test 1.0 as Namespace - -MyQmlObject { - // Enums from non-namespaced type - property int a: MyQmlObject.EnumValue1 - property int b: MyQmlObject.EnumValue2 - property int c: MyQmlObject.EnumValue3 - property int d: MyQmlObject.EnumValue4 - - // Enums from namespaced type - property int e: Namespace.MyQmlObject.EnumValue1 - property int f: Namespace.MyQmlObject.EnumValue2 - property int g: Namespace.MyQmlObject.EnumValue3 - property int h: Namespace.MyQmlObject.EnumValue4 - - // Test that enums don't mask attached properties - property int i: MyQmlObject.value - property int j: Namespace.MyQmlObject.value -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml deleted file mode 100644 index bdc672fadc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.test 1.0 -import Qt.test 1.0 as Namespace - -MyQmlObject { - property int a: MyQmlObject.EnumValue10 - property int b: Namespace.MyQmlObject.EnumValue10 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml b/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml deleted file mode 100644 index a752b8c0d3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool test1: false; - property bool test2: false; - property bool test3: false; - property bool test4: false; - property bool test5: false; - - - property int a: 7 - property int b: 8 - - Component.onCompleted: { - var b = 9; - - test1 = (eval("a") == 7); - test2 = (eval("b") == 9); - try { - eval("c"); - } catch(e) { - test3 = true; - } - test4 = (eval("console") == console); - test5 = (eval("Qt") == Qt); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exception.js b/tests/auto/declarative/qdeclarativeecmascript/data/exception.js deleted file mode 100644 index 160bbfa5b6..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/exception.js +++ /dev/null @@ -1 +0,0 @@ -throw("Whoops!"); diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml deleted file mode 100644 index a2f0d1a8b7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property bool test: objectProperty.objectProperty.trueProperty -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml deleted file mode 100644 index b8d5e5e60f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - Component.onCompleted: - { throw(new Error("JS exception")) } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml deleted file mode 100644 index a4ce55e245..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - value: { throw(new Error("JS exception")) } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml deleted file mode 100644 index 2c382e871a..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -QtObject { - property MyExtendedObject a; - a: MyExtendedObject { id: root } - property int b: Math.max(root.extendedProperty, 0) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup2.qml deleted file mode 100644 index e4af3359d0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup2.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -QtObject { - id: root - property MyExtendedObject a; - a: MyExtendedObject { - id: obj - extendedProperty: 42; - } - function getValue() { - return obj.extendedProperty; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml deleted file mode 100644 index 7734a11dd8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml +++ /dev/null @@ -1,19 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyExtendedObject -{ - baseProperty: baseExtendedProperty - baseExtendedProperty: 13 - - coreProperty: extendedProperty - extendedProperty: 9 - - property QtObject nested: MyExtendedObject { - baseProperty: baseExtendedProperty - baseExtendedProperty: 13 - - coreProperty: extendedProperty - extendedProperty: 9 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjectsPropertyOverride.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjectsPropertyOverride.qml deleted file mode 100644 index 3c443cb975..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjectsPropertyOverride.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.0 - -OverrideDefaultPropertyObject -{ - MyBaseExtendedObject { - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/forInLoop.qml b/tests/auto/declarative/qdeclarativeecmascript/data/forInLoop.qml deleted file mode 100644 index f14367f177..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/forInLoop.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property list<QtObject> objects - objects: [QtObject { objectName: "obj1" }, QtObject { objectName: "obj2" }, QtObject { objectName: "obj3" }] - property string listResult - - function listProperty() { - for (var i in objects) - listResult += i + "=" + objects[i].objectName + "|" - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/function.qml b/tests/auto/declarative/qdeclarativeecmascript/data/function.qml deleted file mode 100644 index af2da7023c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/function.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool test1: false; - property bool test2: false; - property bool test3: false; - - Component.onCompleted: { - var a = 10; - - var func1 = new Function("a", "return a + 7"); - var func2 = new Function("a", "return Qt.atob(a)"); - var func3 = new Function("return a"); - - test1 = (func1(4) == 11); - test2 = (func2("Hello World!") == Qt.atob("Hello World!")); - try { - func3(); - } catch(e) { - test3 = true; - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.1.qml deleted file mode 100644 index 09540f1f6e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.1.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property variant a: function myFunction() { return 2; } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml deleted file mode 100644 index 0f78eaf1dc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml +++ /dev/null @@ -1,73 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -import "functionAssignment.js" as Script - -MyQmlObject { - property variant a - property int aNumber: 10 - - property bool assignToProperty: false - property bool assignToPropertyFromJsFile: false - - property bool assignWithThis: false - property bool assignWithThisFromJsFile: false - - property bool assignToValueType: false - - property bool assignFuncWithoutReturn: false - property bool assignWrongType: false - property bool assignWrongTypeToValueType: false - - - onAssignToPropertyChanged: { - function myFunction() { - return aNumber * 10; - } - a = myFunction; - } - - property QtObject obj: QtObject { - property int aNumber: 4212 - function myFunction() { - return this.aNumber * 10; // should use the aNumber from root, not this object - } - } - onAssignWithThisChanged: { - a = obj.myFunction; - } - - onAssignToPropertyFromJsFileChanged: { - Script.bindPropertyWithThis() - } - - onAssignWithThisFromJsFileChanged: { - Script.bindProperty() - } - - property Text text: Text { } - onAssignToValueTypeChanged: { - text.font.pixelSize = (function() { return aNumber * 10; }) - a = (function() { return text.font.pixelSize; }) - } - - - // detecting errors: - - onAssignFuncWithoutReturnChanged: { - function myFunction() { - } - a = myFunction; - } - - onAssignWrongTypeChanged: { - function myFunction() { - return 'a string'; - } - aNumber = myFunction; - } - - onAssignWrongTypeToValueTypeChanged: { - text.font.pixelSize = (function() { return 'a string'; }) - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.js b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.js deleted file mode 100644 index 14daa7629f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.js +++ /dev/null @@ -1,17 +0,0 @@ -function bindProperty() -{ - a = (function(){ return aNumber * 10 }) -} - - -function TestObject() { } -TestObject.prototype.aNumber = 928349 -TestObject.prototype.bindFunction = function() { - return this.aNumber * 10 // this should not use the TestObject's aNumber -} -var testObj = new TestObject() - -function bindPropertyWithThis() -{ - a = testObj.bindFunction -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml deleted file mode 100644 index 230a626600..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -QtObject { - function myFunction() { - a = 10; - } - - Component.onCompleted: myFunction(); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml deleted file mode 100644 index 8a06c30d8c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: obj - objectName: "obj" - property CircularReferenceHandle first - property CircularReferenceHandle second - - CircularReferenceHandle { - id: crh - objectName: "crh" - } - - function createReference() { - first = crh.generate(crh); - second = crh.generate(crh); - // NOTE: manually add reference from first to second - // in unit test prior reparenting and gc. - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml deleted file mode 100644 index 91edc447e2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: obj - objectName: "obj" - property CircularReferenceHandle first - property CircularReferenceHandle second - - CircularReferenceHandle { - id: crh - objectName: "crh" - } - - function circularReference() { - // generate the circularly referential pair - first = crh.generate(crh); - second = crh.generate(crh); - // note: must manually reparent in unit test - // after setting the handle references. - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml deleted file mode 100644 index 70e8390677..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: obj - objectName: "obj" - - property CircularReferenceObject first - property CircularReferenceObject second - - - CircularReferenceObject { - id: cro - objectName: "cro" - } - - function createReference() { - // generate the objects - first = cro.generate(cro); // has parent, so won't be collected - second = cro.generate(); // no parent, but will be kept alive by first's reference - first.addReference(second); - - // remove top level references - first = cro; - second = cro; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml deleted file mode 100644 index 2ddb9253eb..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: obj - objectName: "obj" - - property CircularReferenceObject first - property CircularReferenceObject second - - - CircularReferenceObject { - id: cro - objectName: "cro" - } - - function circularReference() { - // generate the circularly referential pair - they should still be collected - first = cro.generate(); // no parent, so should be collected - second = cro.generate(); // no parent, so should be collected - first.addReference(second); - second.addReference(first); - - // remove top level references - first = cro; - second = cro; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml deleted file mode 100644 index ece23269f1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - objectProperty: if(1) otherObject - - property variant obj - - obj: QtObject { - id: otherObject - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml deleted file mode 100644 index 650ed7c73e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - objectProperty: otherObject - - property variant obj - - obj: QtObject { - id: otherObject - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.1.js b/tests/auto/declarative/qdeclarativeecmascript/data/importScope.1.js deleted file mode 100644 index 4c556f9e96..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.1.js +++ /dev/null @@ -1 +0,0 @@ -var value = 240 diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.2.js b/tests/auto/declarative/qdeclarativeecmascript/data/importScope.2.js deleted file mode 100644 index 291fb9d2cc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.2.js +++ /dev/null @@ -1,3 +0,0 @@ -function getValue() { - return ImportScope1.value -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml deleted file mode 100644 index 9b907f11f9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import "importScope.1.js" as ImportScope1 -import "importScope.2.js" as ImportScope2 - -QtObject { - property int test: ImportScope2.getValue() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/in.qml b/tests/auto/declarative/qdeclarativeecmascript/data/in.qml deleted file mode 100644 index f84c9a1481..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/in.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - property bool test1: "x" in root - property bool test2: !("foo" in root) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include.js b/tests/auto/declarative/qdeclarativeecmascript/data/include.js deleted file mode 100644 index 232fd808f8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include.js +++ /dev/null @@ -1,8 +0,0 @@ -var test1 = true -var test2 = false -var test3 = false - -function go() { - Qt.include("js/include2.js"); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include.qml deleted file mode 100644 index 5ce2ed78ec..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import "include.js" as IncludeTest - -QtObject { - property int test0: 0 - property bool test1: false - property bool test2: false - property bool test2_1: false - property bool test3: false - property bool test3_1: false - - property int testValue: 99 - - Component.onCompleted: { - IncludeTest.go(); - test0 = IncludeTest.value - test1 = IncludeTest.test1 - test2 = IncludeTest.test2 - test2_1 = IncludeTest.test2_1 - test3 = IncludeTest.test3 - test3_1 = IncludeTest.test3_1 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.js deleted file mode 100644 index ea19eba300..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.js +++ /dev/null @@ -1,11 +0,0 @@ -function go() { - var a = Qt.include("missing.js", function(o) { test2 = o.status == o.NETWORK_ERROR }); - test1 = a.status == a.NETWORK_ERROR - - var b = Qt.include("blank.js", function(o) { test4 = o.status == o.OK }); - test3 = b.status == b.OK - - var c = Qt.include("exception.js", function(o) { test6 = o.status == o.EXCEPTION }); - test5 = c.status == c.EXCEPTION -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml deleted file mode 100644 index fbebcdcd58..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import "include_callback.js" as IncludeTest - -QtObject { - property bool test1: false - property bool test2: false - property bool test3: false - property bool test4: false - property bool test5: false - property bool test6: false - - Component.onCompleted: { - IncludeTest.go(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml deleted file mode 100644 index 7b23c76baa..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import "include_pragma_outer.js" as Script - -Item { - property int test1 - - Component.onCompleted: { - test1 = Script.callFunction() - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_inner.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_inner.js deleted file mode 100644 index a0380a25df..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_inner.js +++ /dev/null @@ -1,5 +0,0 @@ -.pragma library - -function getValue() { - return 100; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_outer.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_outer.js deleted file mode 100644 index d87bafc816..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_outer.js +++ /dev/null @@ -1,6 +0,0 @@ -Qt.include("include_pragma_inner.js") - -function callFunction() { - return getValue(); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js deleted file mode 100644 index e6a4676819..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js +++ /dev/null @@ -1,26 +0,0 @@ -var myvar = 10; - -function go() -{ - 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 - - done = true; - }); - test1 = a.status == a.LOADING - - - 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!"; - test10 = o.exception.toString() == "Whoops!"; - - done2 = true; - }); - test6 = b.status == b.LOADING -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml deleted file mode 100644 index fe020a55df..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 -import "include_remote.js" as IncludeTest - -QtObject { - property bool done: false - property bool done2: false - - property bool test1: false - property bool test2: false - property bool test3: false - property bool test4: false - property bool test5: false - - property bool test6: false - property bool test7: false - property bool test8: false - property bool test9: false - property bool test10: false - - Component.onCompleted: IncludeTest.go(); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js deleted file mode 100644 index cc90860cc9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js +++ /dev/null @@ -1,13 +0,0 @@ -function go() -{ - 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 - - done = true; - }); - - test1 = a.status == a.LOADING -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml deleted file mode 100644 index e8ef609fed..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import "include_remote_missing.js" as IncludeTest - -QtObject { - property bool done: false - - property bool test1: false - property bool test2: false - property bool test3: false - - Component.onCompleted: IncludeTest.go(); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.js deleted file mode 100644 index a49c07bbfc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.js +++ /dev/null @@ -1,12 +0,0 @@ -.pragma library - -var test1 = true -var test2 = false -var test3 = false - -var testValue = 99; - -function go() { - Qt.include("js/include2.js"); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml deleted file mode 100644 index 28b1003fd4..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import "include_shared.js" as IncludeTest - -QtObject { - property int test0: 0 - property bool test1: false - property bool test2: false - property bool test2_1: false - property bool test3: false - property bool test3_1: false - - Component.onCompleted: { - IncludeTest.go(); - test0 = IncludeTest.value - test1 = IncludeTest.test1 - test2 = IncludeTest.test2 - test2_1 = IncludeTest.test2_1 - test3 = IncludeTest.test3 - test3_1 = IncludeTest.test3_1 - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml deleted file mode 100644 index 160a90b574..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - id: root - Component.onCompleted: { - root.myinvokable(root); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml deleted file mode 100644 index 4612273727..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - id: root - property bool test: false - Component.onCompleted: { - test = (root.returnme() == root) - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/js/include2.js b/tests/auto/declarative/qdeclarativeecmascript/data/js/include2.js deleted file mode 100644 index 2a0c039dfa..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/js/include2.js +++ /dev/null @@ -1,4 +0,0 @@ -test2 = true -var test2_1 = true - -Qt.include("include3.js"); diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/js/include3.js b/tests/auto/declarative/qdeclarativeecmascript/data/js/include3.js deleted file mode 100644 index 84b2770b6f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/js/include3.js +++ /dev/null @@ -1,3 +0,0 @@ -test3 = true -var test3_1 = true -var value = testValue diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml deleted file mode 100644 index 4223c25f31..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int test - - Component.onCompleted: { - var o = new Object; - o.test = 92; - test = o.test; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleOne.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleOne.qml deleted file mode 100644 index 97c72bd9a6..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleOne.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -import "importPragmaLibrary.js" as TestPragmaLibraryImport - -Rectangle { - width: TestPragmaLibraryImport.importIncrementedValue() - height: width + 15 - color: "red" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleTwo.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleTwo.qml deleted file mode 100644 index d006343782..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleTwo.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -import "importPragmaLibrary.js" as TestPragmaLibraryImport - -Rectangle { - width: TestPragmaLibraryImport.importIncrementedValue() - height: width + 5 - color: "blue" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importFive.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importFive.js deleted file mode 100644 index e458094552..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importFive.js +++ /dev/null @@ -1,3 +0,0 @@ -function importFiveFunction() { - return '5'; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importFour.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importFour.js deleted file mode 100644 index faddc15c9d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importFour.js +++ /dev/null @@ -1,9 +0,0 @@ -.pragma library - -function importFourFunction() { - return '4'; -} - -function greetingString() { - return 'Hello, World!'; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importModuleApi.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importModuleApi.js deleted file mode 100644 index 7a4f434665..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importModuleApi.js +++ /dev/null @@ -1,5 +0,0 @@ -.import Qt.test 1.0 as QObjectModuleApi - -function testFunc() { - return QObjectModuleApi.qobjectTestProperty -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importOne.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importOne.js deleted file mode 100644 index 338c4e042f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importOne.js +++ /dev/null @@ -1,13 +0,0 @@ -.import "importTwo.js" as ImportTwoJs -.import "importThree.js" as ImportThreeJs - -function greetingString() { - if (ImportTwoJs.greetingString().length > 0) { - return ImportTwoJs.greetingString(); - } - return ImportThreeJs.greetingString(); -} - -function importOneFunction() { - return '1'; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibrary.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibrary.js deleted file mode 100644 index c746fef14b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibrary.js +++ /dev/null @@ -1,9 +0,0 @@ -.pragma library - -var i = 4; - -// .pragma library, so should be callable from multiple .qml with shared i. -function importIncrementedValue() { - i = i + 1; - return i; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibraryWithImports.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibraryWithImports.js deleted file mode 100644 index 3f2e6589dd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibraryWithImports.js +++ /dev/null @@ -1,9 +0,0 @@ -.pragma library -.import "importFive.js" as ImportFive - -var i = 4; - -function importIncrementedValue() { - i = i + 1; - return (i + ImportFive.importFiveFunction()); // i + '5' (not i+5) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibraryWithPragmaLibraryImports.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibraryWithPragmaLibraryImports.js deleted file mode 100644 index fa6497d99b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importPragmaLibraryWithPragmaLibraryImports.js +++ /dev/null @@ -1,11 +0,0 @@ -.pragma library -.import "importPragmaLibrary.js" as LibraryImport - -var i = 10; - -function importIncrementedValue() { - i = i + 1; - // because LibraryImport is shared, and used in previous tests, - // the value will be large (already incremented a bunch of times). - return (i + LibraryImport.importIncrementedValue()); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importThree.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importThree.js deleted file mode 100644 index 3917134ee2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importThree.js +++ /dev/null @@ -1,9 +0,0 @@ -.import "importFour.js" as ImportFourJs - -function greetingString() { - return ImportFourJs.greetingString(); -} - -function importThreeFunction() { - return '3'; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importTwo.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importTwo.js deleted file mode 100644 index 45b3c9a74d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importTwo.js +++ /dev/null @@ -1,10 +0,0 @@ -.import "importFour.js" as ImportFourJs -.import "importFive.js" as ImportFiveJs - -function greetingString() { - return ImportFourJs.greetingString(); -} - -function importTwoFunction() { - return '2'; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importWithNoImports.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importWithNoImports.js deleted file mode 100644 index 83426c425c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importWithNoImports.js +++ /dev/null @@ -1,11 +0,0 @@ -// This js file has no imports, and so should inherit -// scope from the QML file which includes it. - -function componentError() { - var i = 5; - var errorIsOne = Component.error == 1; - if (errorIsOne == true) { - i = i + 7; - } - return i; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImport.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImport.qml deleted file mode 100644 index 456a10c7f0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImport.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - -import "testScriptImport.js" as TestScriptImport -import "testModuleImport.js" as TestModuleImport - -QtObject { - id: testQtObject - - property string importedScriptStringValue: TestScriptImport.greetingText - property int importedScriptFunctionValue: TestScriptImport.randomInteger(1, 20) - - property int importedModuleAttachedPropertyValue: TestModuleImport.importedAttachedPropertyValue(testQtObject) - property int importedModuleEnumValue: TestModuleImport.importedEnumValue -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportModuleApi.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportModuleApi.qml deleted file mode 100644 index b3e545dd7c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportModuleApi.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import "importModuleApi.js" as Script - -Item { - property variant testValue: 5 - - Component.onCompleted: { - testValue = Script.testFunc(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibrary.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibrary.qml deleted file mode 100644 index 29de15c197..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibrary.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 - -// We use the components specified in SpecialRectangleOne.qml and SpecialRectangleTwo.qml - -QtObject { - id: testQtObject - - property SpecialRectangleOne a; - property SpecialRectangleTwo b; - - a: SpecialRectangleOne { - id: rectangleOne - } - b: SpecialRectangleTwo { - id: rectangleTwo - } - - // this should be: (5 + 15) + (6 + 5) == 31 - property int testValue: rectangleOne.height + rectangleTwo.height -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibraryWithImports.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibraryWithImports.qml deleted file mode 100644 index 6a7459d3bb..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibraryWithImports.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import "importPragmaLibraryWithImports.js" as LibraryImport - -QtObject { - id: root - property int testValue: LibraryImport.importIncrementedValue(); // valueOf(4 + 1 + '5') = valueOf('55') = 55 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml deleted file mode 100644 index 01f08dbdc3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import "importPragmaLibraryWithPragmaLibraryImports.js" as LibraryImport - -QtObject { - id: root - property int testValue: LibraryImport.importIncrementedValue(); // 10 + 1 + (7 due to previous tests) = 18 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportScoping.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportScoping.qml deleted file mode 100644 index aff61cc436..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportScoping.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -// For backward compatibility, importing a script which has no imports, -// should run the script in the parent context. See QTBUG-17518. - -import "importWithNoImports.js" as TestNoImportScoping - -QtObject { - id: testQtObject - property int componentError: TestNoImportScoping.componentError() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testModuleImport.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testModuleImport.js deleted file mode 100644 index 69bc1c9887..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testModuleImport.js +++ /dev/null @@ -1,8 +0,0 @@ -.import Qt.test 1.0 as JsQtTest // test that we can import elements from .js files - -function importedAttachedPropertyValue(obj) { - return obj.JsQtTest.MyQmlObject.value; // attached property, value = 19. -} - -var importedEnumValue = JsQtTest.MyQmlObject.EnumValue3 // the actual value of this enum value is "2" - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testScriptImport.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testScriptImport.js deleted file mode 100644 index 2ecccd8816..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testScriptImport.js +++ /dev/null @@ -1,11 +0,0 @@ -.import "importOne.js" as ImportOneJs // test that we can import scripts from .js files - -var greetingText = ImportOneJs.greetingString() - -function randomInteger(min, max) { - if (max > min) { - if (min > 10) return min; - return max; - } - return min; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml deleted file mode 100644 index 73193a35a5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -// This should fail, since if the script does have imports -// of its own, it should run in its own context. - -import "importWithImports.js" as TestImportScoping - -QtObject { - id: testQtObject - property int componentError: TestImportScoping.componentError() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml deleted file mode 100644 index ef2fc591b3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -import "testModuleImport.js" as TestModuleImport - -QtObject { - property int importedModuleEnumValue: JsQtTest.MyQmlObject.EnumValue3 // should fail - the typenames available in TestModuleImport should not be available in this scope -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml deleted file mode 100644 index d0c37ad9ba..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -import "testScriptImport.js" as TestScriptImport - -QtObject { - property string importScriptFunctionValue: TestScriptImport.ImportOneJs.greetingString() // should fail - the context of TestScriptImport is private to TestScriptImport. -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml deleted file mode 100644 index edd103bd82..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -import "testModuleImport.js" as TestModuleImport - -QtObject { - id: testQtObject - property int importedModuleAttachedPropertyValue: testQtObject.TestModuleImport.JsQtTest.MyQmlObject.value // should fail - the context of TestScriptImport is private to TestScriptImport. -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml deleted file mode 100644 index 28e2026f8d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -import "testScriptImport.js" as TestScriptImport - -QtObject { - property string importScriptFunctionValue: ImportOneJs.greetingString() // should fail - the typenames in TestScriptImport should not be visible from this scope -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importOne.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importOne.js deleted file mode 100644 index 45fd9c75dd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importOne.js +++ /dev/null @@ -1,7 +0,0 @@ -function greetingString() { - return 'Hello, World!'; -} - -function importOneFunction() { - return '1'; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importPragmaLibrary.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importPragmaLibrary.js deleted file mode 100644 index ad0e6946a2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importPragmaLibrary.js +++ /dev/null @@ -1,11 +0,0 @@ -.pragma library - -// .pragma library, so shouldn't inherit imports from any .qml file. -function importValue() { - var i = 3; - var errorIsOne = Component.error == 1; // this line should fail. - if (errorIsOne == true) { - i = i + 4; - } - return i; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importWithImports.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importWithImports.js deleted file mode 100644 index 6d77ceccb1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importWithImports.js +++ /dev/null @@ -1,13 +0,0 @@ -.import "importOne.js" as ImportOne - -// This js file has imports, so should not inherit -// scope from the QML file which includes it. - -function componentError() { - var i = 3; - var errorIsOne = Component.error == 1; // this line should fail. - if (errorIsOne == true) { - i = i + 4; - } - return i; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml deleted file mode 100644 index f04ce007d8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -import "importPragmaLibrary.js" as ImportPragmaLibrary - -QtObject { - id: testQtObject - property int testValue: ImportPragmaLibrary.importValue() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testModuleImport.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testModuleImport.js deleted file mode 100644 index 69bc1c9887..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testModuleImport.js +++ /dev/null @@ -1,8 +0,0 @@ -.import Qt.test 1.0 as JsQtTest // test that we can import elements from .js files - -function importedAttachedPropertyValue(obj) { - return obj.JsQtTest.MyQmlObject.value; // attached property, value = 19. -} - -var importedEnumValue = JsQtTest.MyQmlObject.EnumValue3 // the actual value of this enum value is "2" - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testScriptImport.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testScriptImport.js deleted file mode 100644 index 2ecccd8816..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testScriptImport.js +++ /dev/null @@ -1,11 +0,0 @@ -.import "importOne.js" as ImportOneJs // test that we can import scripts from .js files - -var greetingText = ImportOneJs.greetingString() - -function randomInteger(min, max) { - if (max > min) { - if (min > 10) return min; - return max; - } - return min; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.js b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.js deleted file mode 100644 index 3ffdb339ad..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.js +++ /dev/null @@ -1,6 +0,0 @@ -.pragma library - -function test(target) -{ - var a = target.a; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml deleted file mode 100644 index 5884e2719b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import "libraryScriptAssert.js" as Test - -QtObject { - id: root - Component.onCompleted: Test.test(root); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listAssignment.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listAssignment.qml deleted file mode 100644 index 6e6039715b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/listAssignment.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - width: 640 - height: 480 - - property int list1length: list1.length - - property list<MyQmlObject> list1 - property list<MyQmlObject> list2: [ - MyQmlObject { id: one; value: 100 }, - MyQmlObject { id: two; value: 300 } - ] - - Component.onCompleted: { - root.list1 = root.list2; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml deleted file mode 100644 index bdb1265a21..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml +++ /dev/null @@ -1,24 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - id: root - - objectListProperty: [ - QtObject { property int a: 10 }, - QtObject { property int a: 11 } - ] - - function calcTest1() { - var rv = 0; - for (var ii = 0; ii < root.objectListProperty.length; ++ii) { - rv += root.objectListProperty[ii].a; - } - return rv; - } - - property int test1: calcTest1(); - property int test2: root.objectListProperty.length - property bool test3: root.objectListProperty[1] != undefined - property bool test4: root.objectListProperty[100] == undefined -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml deleted file mode 100644 index 690024b928..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test: children -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision.qml deleted file mode 100644 index 77accd80de..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.1 - -MyRevisionedClass -{ - prop1: prop2 - onSignal1: method2() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision2.qml deleted file mode 100644 index 36057cb902..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision2.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Qt.test 1.1 - -MyRevisionedSubclass -{ - prop1: prop3 - onSignal1: method2() - prop3: prop4 - onSignal3: method4() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision3.qml deleted file mode 100644 index 81769e98f7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision3.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.test 1.0 - -MyRevisionedSubclass -{ - prop1: prop3 - onSignal1: method1() - onSignal3: method3() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision4.qml deleted file mode 100644 index 6ebe4790bb..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision4.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.1 -import QtQuick 2.0 - -QtObject { - property variant a - property real test - - a: MyRevisionedClass { - prop2: 11 - - Component.onCompleted: test = prop2 - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors.qml deleted file mode 100644 index 8a7e24d788..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyRevisionedClass -{ - // Will not hit optimizer - property real p1: prop1 % 3 - property real p2: prop2 % 3 - - // Should hit optimizer - property real p3: prop2 - - Component.onCompleted: method2() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors2.qml deleted file mode 100644 index 43e87948cd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors2.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyRevisionedSubclass -{ - // Will not hit optimizer - property real p1: prop1 % 3 - property real p2: prop2 % 3 - property real p3: prop3 % 3 - property real p4: prop4 % 3 - - // Should hit optimizer - property real p5: prop1 - property real p6: prop2 - property real p7: prop3 - property real p8: prop4 - - Component.onCompleted: { - method1() - method2() - method3() - method4() - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors3.qml deleted file mode 100644 index 2f82d685fa..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors3.qml +++ /dev/null @@ -1,36 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.1 - -MyRevisionedSubclass -{ - // Will not hit optimizer - property real pA: propA % 3 - property real pB: propB % 3 - property real pC: propC % 3 - property real pD: propD % 3 - property real p1: prop1 % 3 - property real p2: prop2 % 3 - property real p3: prop3 % 3 - property real p4: prop4 % 3 - - // Should hit optimizer - property real pE: propA - property real pF: propB - property real pG: propC - property real pH: propD - property real p5: prop1 - property real p6: prop2 - property real p7: prop3 - property real p8: prop4 - - Component.onCompleted: { - methodA() - methodB() - methodC() - methodD() - method1() - method2() - method3() - method4() - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml deleted file mode 100644 index 0bbee16df8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - id: myObject - onBasicSignal: myObject.methodNoArgs() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml deleted file mode 100644 index 9f0c6b15fe..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - id: myObject - onBasicSignal: myObject.method(163) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml deleted file mode 100644 index 365780a560..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -QtObject { - function testFunction() { return 19; } - - property int test: testFunction() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml deleted file mode 100644 index a3bd7bebf8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -MethodsObject { - function testFunction2() { return 17; } - function testFunction3() { return 16; } - - property int test: testFunction() - property int test2: testFunction2() - property int test3: testFunction3() -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml deleted file mode 100644 index ede2759e2e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -Item { - property alias blah: item.x - Item { id: item } - - function testFunction() { return 9; } - property int test: testFunction(); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/moduleApiMajorVersionFail.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/moduleApiMajorVersionFail.qml deleted file mode 100644 index fb050f65bc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/moduleApiMajorVersionFail.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -// this qml file attempts to import an invalid version of a qobject module API. - -import Qt.test.qobjectApi 4.0 as QtTestMajorVersionQObjectApi // qobject module API installed into existing uri with nonexistent major version - -QtObject { - property int qobjectMajorVersionTest: QtTestMajorVersionQObjectApi.qobjectTestProperty -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/moduleApiMinorVersionFail.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/moduleApiMinorVersionFail.qml deleted file mode 100644 index e06be667f7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/moduleApiMinorVersionFail.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -// this qml file attempts to import an invalid version of a qobject module API. - -import Qt.test.qobjectApi 1.2 as QtTestMinorVersionQObjectApi // qobject module API installed into existing uri with nonexistent minor version - -QtObject { - property int qobjectMinorVersionTest: QtTestMinorVersionedQObjectApi.qobjectTestProperty -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApi.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApi.qml deleted file mode 100644 index 718a64652d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApi.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 - -import Qt.test 1.0 as QtTest // module API installed into existing uri -import Qt.test.qobjectApi 1.0 as QtTestQObjectApi // qobject module API installed into new uri -import Qt.test.qobjectApi 1.3 as QtTestMinorVersionQObjectApi // qobject module API installed into existing uri with new minor version -import Qt.test.qobjectApi 2.0 as QtTestMajorVersionQObjectApi // qobject module API installed into existing uri with new major version -import Qt.test.qobjectApiParented 1.0 as QtTestParentedQObjectApi // qobject (with parent) module API installed into a new uri - -QtObject { - property int existingUriTest: QtTest.qobjectTestProperty - property int qobjectTest: QtTestQObjectApi.qobjectTestProperty - property int qobjectMethodTest: 2 - property int qobjectMinorVersionTest: QtTestMinorVersionQObjectApi.qobjectTestProperty - property int qobjectMajorVersionTest: QtTestMajorVersionQObjectApi.qobjectTestProperty - property int qobjectParentedTest: QtTestParentedQObjectApi.qobjectTestProperty - - Component.onCompleted: { - qobjectMethodTest = QtTestQObjectApi.qobjectTestMethod(); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiCaching.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiCaching.qml deleted file mode 100644 index 56a55e4e9b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiCaching.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -import Qt.test 1.0 as QtTest // module API installed into existing uri -import Qt.test.qobjectApiParented 1.0 as QtTestParentedQObjectApi // qobject (with parent) module API installed into a new uri - -QtObject { - property int existingUriTest: QtTest.qobjectTestProperty - property int qobjectParentedTest: QtTestParentedQObjectApi.qobjectTestProperty -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiEnums.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiEnums.qml deleted file mode 100644 index da5ffd5e76..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiEnums.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import Qt.test.qobjectApi 1.0 as QtTestQObjectApi // qobject module API installed into new uri - -QtObject { - property int enumValue: QtTestQObjectApi.EnumValue2; - property int enumMethod: QtTestQObjectApi.qobjectEnumTestMethod(QtTestQObjectApi.EnumValue1); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiWriting.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiWriting.qml deleted file mode 100644 index be647ca57f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/qobjectModuleApiWriting.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 as QtTest // qobject module API installed into existing uri - -QtObject { - property int firstProperty: 1 - property int secondProperty: 2 - property int readOnlyProperty: QtTest.qobjectTestProperty - property int writableProperty: QtTest.qobjectTestWritableProperty - - onFirstPropertyChanged: { - // In this case, we want to attempt to set the module API property. - // This should fail, as the module API property is read only. - if (firstProperty != QtTest.qobjectTestProperty) { - QtTest.qobjectTestProperty = firstProperty; // should silently fail. - } - } - - onSecondPropertyChanged: { - // In this case, we want to attempt to set the module API property. - // This should succeed, as the module API property is writable. - if (secondProperty != QtTest.qobjectTestWritableProperty) { - QtTest.qobjectTestWritableProperty = secondProperty; // should succeed. - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApi.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApi.qml deleted file mode 100644 index 7c4e20489d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApi.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import Qt.test.scriptApi 1.0 as QtTestScriptApi // script module API installed into new uri - -QtObject { - property int scriptTest: QtTestScriptApi.scriptTestProperty // script module api's only provide properties. -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApiCaching.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApiCaching.qml deleted file mode 100644 index 90974b5969..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApiCaching.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import Qt.test.scriptApi 1.0 as QtTestScriptApi // script module API installed into new uri - -QtObject { - property int scriptTest: QtTestScriptApi.scriptTestProperty -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApiWriting.qml b/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApiWriting.qml deleted file mode 100644 index 02461d59ed..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/moduleapi/scriptModuleApiWriting.qml +++ /dev/null @@ -1,32 +0,0 @@ -import QtQuick 2.0 -import Qt.test.scriptApi 1.0 as QtTestScriptApi -import Qt.test.scriptApi 2.0 as QtTestScriptApi2 - -QtObject { - property int firstProperty - property int readBack - - property int secondProperty - property int unchanged - - onFirstPropertyChanged: { - if (QtTestScriptApi.scriptTestProperty != firstProperty) { - QtTestScriptApi.scriptTestProperty = firstProperty; - readBack = QtTestScriptApi.scriptTestProperty; - } - } - - onSecondPropertyChanged: { - if (QtTestScriptApi2.scriptTestProperty != secondProperty) { - QtTestScriptApi2.scriptTestProperty = secondProperty; - unchanged = QtTestScriptApi2.scriptTestProperty; - } - } - - Component.onCompleted: { - firstProperty = QtTestScriptApi.scriptTestProperty; - readBack = QtTestScriptApi.scriptTestProperty; - secondProperty = QtTestScriptApi2.scriptTestProperty; - unchanged = QtTestScriptApi2.scriptTestProperty; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml deleted file mode 100644 index e349ced98f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string test: thing.stringProperty -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml deleted file mode 100644 index 23276f778d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - - Item {} - - SpuriousWarning {} -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml b/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml deleted file mode 100644 index b4a417e04e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - - property int childrenCount: root.children.length - - Item {} -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nonExistentAttachedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonExistentAttachedObject.qml deleted file mode 100644 index f9585db009..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/nonExistentAttachedObject.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - stringProperty: MyQmlContainer.prop -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nonNotifyable.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonNotifyable.qml deleted file mode 100644 index 2b8b113c34..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/nonNotifyable.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - id: root - property int test: root.value -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml deleted file mode 100644 index e96df6b40e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml +++ /dev/null @@ -1,19 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - id: root - - property bool readOk: false; - property bool writeOk: false - - Component.onCompleted: { - readOk = (root.nonscriptable == undefined); - - try { - root.nonscriptable = 10 - } catch (e) { - writeOk = true; - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml deleted file mode 100644 index 1aee7a1670..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property QtObject test - test: if (1) model - property ListModel model -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/numberAssignment.qml b/tests/auto/declarative/qdeclarativeecmascript/data/numberAssignment.qml deleted file mode 100644 index 30a77e8aed..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/numberAssignment.qml +++ /dev/null @@ -1,18 +0,0 @@ -import Qt.test 1.0 - -NumberAssignment { - test1: if (1) 6.7 - test2: if (1) "6.7" - test3: if (1) 6 - test4: if (1) "6" - - test5: if (1) 6.7 - test6: if (1) "6.7" - test7: if (1) 6 - test8: if (1) "6" - - test9: if (1) 6.7 - test10: if (1) "6.7" - test11: if (1) 6 - test12: if (1) "6" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectConversion.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectConversion.qml deleted file mode 100644 index 67fc342db3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/objectConversion.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - width: 360 - height: 360 - - function circularObject() { - var a = {} - var b = {} - - a.test = 100; - a.c = b; - b.c = a; - return a; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectName.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectName.qml deleted file mode 100644 index 20b9ec2935..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/objectName.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -QtObject { - objectName: "hello" - - property string test1: objectName - property string test2: objectName.substr(1, 3) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml deleted file mode 100644 index 845f74b1aa..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - - property variant item: child - Item { id: child } - - property bool test1: child == child - property bool test2: child.parent == root - property bool test3: root != child - property bool test4: item == child - property bool test5: item != root -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml deleted file mode 100644 index 98f9e05bdf..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property bool test: false - - signal mysignal(variant object); - function myslot(object) - { - test = (object == root); - } - - Component.onCompleted: { - mysignal.connect(this, myslot); - mysignal(root); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml deleted file mode 100644 index 090c948f26..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml +++ /dev/null @@ -1,15 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - id: obj - property alias c1: myConstants.c1 - property alias c2: myConstants.c2 - property int c3: 0 - - objectProperty: ConstantsOverrideBindings { - id: myConstants - c2: obj.c3 - } - -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml deleted file mode 100644 index 855a264995..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - Component.onCompleted: { var a = getObject(); a = null; } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml deleted file mode 100644 index 34523ec1c7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property int a - property variant b - - property bool test1: false; - property bool test2: false; - - Component.onCompleted: { - try { - root.a = undefined; - } catch(e) { - if (e.message == "Cannot assign [undefined] to int" && - e.stack.indexOf("propertyAssignmentErrors.qml:14") != -1) - root.test1 = true; - } - - try { - root.a = "Hello"; - } catch(e) { - if (e.message == "Cannot assign QString to int" && - e.stack.indexOf("propertyAssignmentErrors.qml:22") != -1) - root.test2 = true; - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertySplicing.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertySplicing.qml deleted file mode 100644 index 53711db3f4..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertySplicing.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyDerivedObject { - property bool test: false - - Component.onCompleted: { - test = intProperty() - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.1.qml deleted file mode 100644 index 219e61bf91..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.1.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - property bool test: false - - property var car: new vehicle(4); - property int wheelCount: car.wheels - - function vehicle(wheels) { - this.wheels = wheels; - } - - Component.onCompleted: { - car.wheels = 6; // not bindable, wheelCount shouldn't update - - if (car.wheels != 6) return; - if (wheelCount != 4) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.10.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.10.qml deleted file mode 100644 index ac7f2bed57..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.10.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -PropertyVarBaseItem { - property bool test: false - Component.onCompleted: { - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.2.qml deleted file mode 100644 index 2ac4807ec5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.2.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - property bool test: false - - property var truck: new vehicle(8); - property int wheelCount: truck.wheels - - function vehicle(wheels) { - this.wheels = wheels; - } - - Component.onCompleted: { - if (wheelCount != 8) return; - - // not bindable, but wheelCount will update because truck itself changed. - truck = new vehicle(12); - - if (wheelCount != 12) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.3.qml deleted file mode 100644 index cf6a651639..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.3.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - property bool test: false - - property var jsint: 4 - property int bound: jsint + 5 - - Component.onCompleted: { - if (bound != 9) return; - - jsint = jsint + 1; - - if (bound != 10) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.4.qml deleted file mode 100644 index 82fc225e71..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.4.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -Item { - property bool test: false - - property var items: [1, 2, 3, "four", "five"] - property int bound: items[0] - - Component.onCompleted: { - if (bound != 1) return; - - items[0] = 10 // bound should remain 1 - - if (bound != 1) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.5.qml deleted file mode 100644 index a5c7812289..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.5.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -Item { - property bool test: false - - property var attributes: { 'color': 'red', 'width': 100 } - property int bound: attributes.width - - Component.onCompleted: { - if (bound != 100) return; - - attributes.width = 200 // bound should remain 100 - - if (bound != 100) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.6.qml deleted file mode 100644 index 060d24e7bc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.6.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 - -Item { - property bool test: false - - property var items: [1, 2, 3, "four", "five"] - property int bound: items[0] - property var funcs: [(function() { return 6; })] - property int bound2: funcs[0]() - - function returnTwenty() { - return 20; - } - - Component.onCompleted: { - if (bound != 1) return false; - if (bound2 != 6) return false; - - items = [10, 2, 3, "four", "five"] // bound should now be 10 - funcs = [returnTwenty] // bound2 should now be 20 - - if (bound != 10) return false; - if (bound2 != 20) return false; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.7.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.7.qml deleted file mode 100644 index 1d6c8c0a37..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.7.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -Item { - property bool test: false - - property var attributes: { 'color': 'red', 'width': 100 } - property int bound: attributes.width - - Component.onCompleted: { - if (bound != 100) return; - - attributes = { 'color': 'blue', 'width': 200 } // bound should now be 200 - - if (bound != 200) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.8.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.8.qml deleted file mode 100644 index a9f73db402..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.8.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -Item { - property bool test: false - - property var literalValue: 6 - - Component.onCompleted: { - if (literalValue != 6) return; - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.9.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.9.qml deleted file mode 100644 index f5aca28417..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.9.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - property bool test: false - - MyQmlObject { - id: qmlobject - intProperty: 5 - } - property var qobjectVar: qmlobject - property int bound: qobjectVar.intProperty - - Component.onCompleted: { - if (bound != 5) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.2.qml deleted file mode 100644 index 93c44afcc9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.2.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - objectName: "separateRootObject" - property var vp - - function constructGarbage() { - var retn = 1; - var component = Qt.createComponent("PropertyVarCircularComponent3.qml"); - if (component.status == Component.Ready) { - retn = component.createObject(null); // has JavaScript ownership - } - return retn; - } - - function assignCircular() { - vp = constructGarbage(); - gc(); - } - - function deassignCircular() { - vp = 2; - gc(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.qml deleted file mode 100644 index 171d7747cd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.qml +++ /dev/null @@ -1,44 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: testCircular - - property var varProperty - property variant canaryResource - property int canaryInt - - function constructGarbage() { - var retn = 1; - var component = Qt.createComponent("PropertyVarCircularComponent.qml"); - if (component.status == Component.Ready) { - retn = component.createObject(null); // has JavaScript ownership - } - return retn; - } - - function deassignCanaryResource() { - canaryResource = 1; - gc(); - } - - function assignCircular() { - varProperty = constructGarbage(); - canaryResource = varProperty.vp.vp.vp.vp.memoryHog; - canaryInt = varProperty.vp.vp.vp.vp.fifthCanary; // == 5 - gc(); - } - - function deassignCircular() { - canaryInt = 2; - varProperty = 2; - gc(); - } - - function assignThenDeassign() { - varProperty = constructGarbage(); - varProperty = 2; - gc(); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.inherit.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.inherit.qml deleted file mode 100644 index abd0dd7c04..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.inherit.qml +++ /dev/null @@ -1,34 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: testInheritance - - property var varProperty - - function constructGarbage() { - var retn = 1; - var component = Qt.createComponent("PropertyVarInheritanceComponent.qml"); - if (component.status == Component.Ready) { - retn = component.createObject(null); // has JavaScript ownership - } - return retn; - } - - function assignCircular() { - varProperty = constructGarbage(); - gc(); - } - - function deassignCircular() { - varProperty = 2; - gc(); - } - - function assignThenDeassign() { - varProperty = constructGarbage(); - varProperty = 2; - gc(); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.reparent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.reparent.qml deleted file mode 100644 index 7b3df674f1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.reparent.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - objectName: "separateRootObject" - property var vp - - function constructGarbage() { - var retn = 1; - var component = Qt.createComponent("PropertyVarOwnershipComponent.qml"); - if (component.status == Component.Ready) { - retn = component.createObject(null); // has JavaScript ownership - } - return retn; - } - - function assignVarProp() { - vp = constructGarbage(); - gc(); - } - - function deassignVarProp() { - vp = 2; - gc(); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarCpp.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarCpp.qml deleted file mode 100644 index cd3147f565..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarCpp.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: testOwnership - property int intProperty: 10 - property var varProperty: intProperty - property var varProperty2: false - property var varBound: varProperty + 5 - property int intBound: varProperty + 5 - property var jsobject: new vehicle(4) - - function vehicle(wheels) { - this.wheels = wheels; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarImplicitOwnership.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarImplicitOwnership.qml deleted file mode 100644 index 9cebded932..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarImplicitOwnership.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - objectName: "separateRootObject" - property var vp - - function constructGarbage() { - var retn = 1; - var component = Qt.createComponent("PropertyVarCircularComponent4.qml"); - if (component.status == Component.Ready) { - retn = component.createObject(null); // has JavaScript ownership - } - return retn; - } - - function assignCircular() { - vp = constructGarbage(); - gc(); - } - - function deassignCircular() { - vp = 2; - gc(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.2.qml deleted file mode 100644 index 14d4f9fd27..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.2.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: testOwnership - property bool test: false - - property int dummyProperty // Tests for non-interference of other properties - property var varProperty - - function runTest() { - if (varProperty != undefined) return; - varProperty = { a: 10, b: 11 } - if (varProperty.a != 10) return; - - gc(); // Shouldn't collect - - if (varProperty.a != 10) return; - - test = true; - } -} - - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.qml deleted file mode 100644 index d5b449c938..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.qml +++ /dev/null @@ -1,31 +0,0 @@ -import QtQuick 2.0 - -Item { - property var object - - property bool test1: false - property bool test2: false - - // Test methods are executed in sequential order - - function runTest() { - var c = Qt.createComponent("propertyVarOwnership.3.type.qml"); - object = c.createObject(); - - if (object.dummy != 10) return; - test1 = true; - } - - // Run gc() from C++ - - function runTest2() { - if (object.dummy != 10) return; - - object = undefined; - if (object != undefined) return; - - test2 = true; - } - - // Run gc() from C++ - QObject should be collected -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.type.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.type.qml deleted file mode 100644 index 3406553b91..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.type.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int dummy: 10 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.qml deleted file mode 100644 index 1eba36ce81..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.qml +++ /dev/null @@ -1,25 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - - property var object - - property bool test: false - - Component.onCompleted: { - var c = Qt.createComponent("propertyVarOwnership.4.type1.qml"); - object = c.createObject(); - - if (object.dummy != 10) return; - if (object.test != true) return; - - object.creatorRef = root; - - test = true; - } - - function runTest() { - object = null; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type1.qml deleted file mode 100644 index 9a29b6e17f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type1.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 - -// Has a self reference in selfRef, and a reference to propertyVarOwnership.4.qml in creatorRef -Item { - id: root - - property var creatorRef - property var selfRef - property var object - - property int dummy: 10 - property bool test: false - - Component.onCompleted: { - selfRef = root; - - var c = Qt.createComponent("propertyVarOwnership.4.type2.qml"); - object = c.createObject(); - object.creatorRef = root; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type2.qml deleted file mode 100644 index f82b8a1c1e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type2.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -// Has a reference to propertyVarOwnership.4.type1.qml in creatorRef -Item { - property var creatorRef -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.qml deleted file mode 100644 index 7b99c4b6ad..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: testOwnership - property bool test: false - - property var varProperty - - function runTest() { - if (varProperty != undefined) return; - varProperty = { a: 10, b: 11 } - if (varProperty.a != 10) return; - - gc(); // Shouldn't collect - - if (varProperty.a != 10) return; - - test = true; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml deleted file mode 100644 index 3c1986d721..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int test: getObjects().length - property bool test2: getObjects()[0].trueProperty -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qobjectConnectionListExceptionHandling.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qobjectConnectionListExceptionHandling.qml deleted file mode 100644 index acd512a2be..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qobjectConnectionListExceptionHandling.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - property int first: 5 - property bool test: false - - Item { - id: exceptional - function exceptionalFunction() { - var obj = undefined; - var prop = undefined; - return obj[prop]; - } - } - - Component.onCompleted: { - root["firstChanged"].connect(exceptional.exceptionalFunction); - root["firstChanged"].connect(exceptional.exceptionalFunction); - root["firstChanged"].connect(exceptional.exceptionalFunction); - first = 6; - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qobjectDerivedArgument.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qobjectDerivedArgument.qml deleted file mode 100644 index bf4ab6fd7a..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qobjectDerivedArgument.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - id: root - stringProperty: 'hello' - property var child - - property bool result: false - - Component.onCompleted: { - child = invokable.createMyQmlObject('goodbye'); - - result = (invokable.getStringProperty(root) == 'hello') && - (invokable.getStringProperty(child) == 'goodbye'); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml deleted file mode 100644 index 90263e5124..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string test: "aaaa" - + "bbbb" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc" - + "cccc"; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.js b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.js deleted file mode 100644 index 092bc2b041..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.js +++ /dev/null @@ -1 +0,0 @@ -; diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml deleted file mode 100644 index 6c7e8806e6..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import "qtbug_11600.js" as Test - -QtObject { - id: goo - - property bool test: undefined == goo.Test -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml deleted file mode 100644 index b1b062ed35..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool test: false - Component.onCompleted: { - try { - console.log(sorryNoSuchProperty); - } catch (e) { - test = true; - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20344.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20344.qml deleted file mode 100644 index f490848caf..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20344.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - Component.onCompleted: v8function() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21580.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21580.qml deleted file mode 100644 index dc0066ba3f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21580.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool test: false - - property list<QtObject> objects: [ - QtObject { - id: first - property alias myAlias: other.myProperty - onMyAliasChanged: if (myAlias == 20) test = true - }, - QtObject { - id: other - property real myProperty - } - ] - - Component.onCompleted: { - other.myProperty = 20; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.js b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.js deleted file mode 100644 index e1a688ebbe..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.js +++ /dev/null @@ -1,2 +0,0 @@ -var a = { b: 10 } -var test = (typeof a) == "object" diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml deleted file mode 100644 index 0f972d5459..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "qtbug_21864.js" as Test -import QtQuick 2.0 - -QtObject { - property bool test: Test.test -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22464.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22464.qml deleted file mode 100644 index 19f26736f1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22464.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property alias value: inner.value - property bool test: false - - property variant dummy: QtObject { - id: inner - property variant value: Qt.rgba(1, 1, 0, 1); - } - - Component.onCompleted: { - test = (value == Qt.rgba(1, 1, 0, 1)); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22679.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22679.qml deleted file mode 100644 index b38a84b4c0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22679.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - -QtObject { - function accessContextProperty() { - for (var i = 0; i < contextProp.stringProperty.length; ++i) ; - } - - Component.onCompleted: { - for (var i = 0; i < 1000; ++i) - accessContextProperty(); - // Shouldn't cause "Illegal invocation" error. - gc(); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.js b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.js deleted file mode 100644 index 6d19fe0571..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.js +++ /dev/null @@ -1,5 +0,0 @@ - -function func() -{ - isFinite() ) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.library.js b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.library.js deleted file mode 100644 index 1a7c8a2e6e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.library.js +++ /dev/null @@ -1,5 +0,0 @@ -.pragma library -function func() -{ - isFinite() ) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.library.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.library.qml deleted file mode 100644 index 281765bff6..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.library.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "qtbug_22843.library.js" as MyScript -import QtQuick 2.0 - -QtObject { - Component.onCompleted: MyScript.func() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.qml deleted file mode 100644 index 90a47c0f4b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_22843.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "qtbug_22843.js" as MyScript -import QtQuick 2.0 - -QtObject { - Component.onCompleted: MyScript.func() -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_9792.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_9792.qml deleted file mode 100644 index 9ac44308c6..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_9792.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - onBasicSignal: print("Hello world!"); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml deleted file mode 100644 index 90711c8d09..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - property QtObject object: QtObject { - id: nested - property QtObject nestedObject - } - - Component.onCompleted: { - nested.nestedObject = root; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/readonlyDeclaration.qml b/tests/auto/declarative/qdeclarativeecmascript/data/readonlyDeclaration.qml deleted file mode 100644 index 5377d2dcbf..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/readonlyDeclaration.qml +++ /dev/null @@ -1,45 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int dummy: 13 - - readonly property int test1: 19 - readonly property int test2: dummy * 49 - readonly property alias test3: other.test - - property bool test: false - - property var dummyObj: QtObject { - id: other - property int test: 9 - } - - Component.onCompleted: { - if (test1 != 19) return; - if (test2 != 637) return; - if (test3 != 9) return; - - var caught = false; - - caught = false; - try { test1 = 13 } catch (e) { caught = true; } - if (!caught) return; - - caught = false; - try { test2 = 13 } catch (e) { caught = true; } - if (!caught) return; - - caught = false; - try { test3 = 13 } catch (e) { caught = true; } - if (!caught) return; - - other.test = 13; - dummy = 9; - - if (test1 != 19) return; - if (test2 != 441) return; - if (test3 != 13) return; - - test = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/realToInt.qml b/tests/auto/declarative/qdeclarativeecmascript/data/realToInt.qml deleted file mode 100644 index a9e7dd2a95..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/realToInt.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - function test1() { - value = 4.2 - } - function test2() { - value = 7.9 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/regExp.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/regExp.2.qml deleted file mode 100644 index 68cca5733b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/regExp.2.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject{ - id: obj - objectName: "obj" - regExp: "[a-zA-z]" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml b/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml deleted file mode 100644 index 0dc404b5db..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject{ - id: obj - objectName: "obj" - regExp: /[a-zA-z]/ -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/remote_file.js b/tests/auto/declarative/qdeclarativeecmascript/data/remote_file.js deleted file mode 100644 index 1b123aee61..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/remote_file.js +++ /dev/null @@ -1,2 +0,0 @@ -myvar = 13; -test5 = true; diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/rewriteMultiLineStrings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/rewriteMultiLineStrings.qml deleted file mode 100644 index 1ae1b162b2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/rewriteMultiLineStrings.qml +++ /dev/null @@ -1,35 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root; - property bool test: str == str2 && (txt != null && txt.str == root.str) - property Text txt: null - //Constant doesn't hit rewriter - property string str: 'same -multiline -string 5 !' - property string str2: ''; - Component { - id: comp - Text { - property var value: 1 - property string str: 'same -multiline -string ' + value + " !" - Component.onCompleted: { //Separate codepath for signal handers in rewriter - root.str2 = 'same -multiline -string ' + value + " !" - } - } - } - Component.onCompleted: txt = comp.createObject(root,{"value" : 5}) - /* - Timer { - interval: 1000 - running: true - repeat: true - onTriggered: console.debug( "Test: " + test + '\n' + str + '\n:\n' + str2 + "\n:\n" + txt.str) - } - */ -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/rewriteMultiLineStrings_crlf.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/rewriteMultiLineStrings_crlf.1.qml deleted file mode 100644 index f84ba8c722..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/rewriteMultiLineStrings_crlf.1.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - id: root - - Component.onCompleted: { - var o = Qt.createQmlObject("import QtQuick 2.0; \ - \ - Item { \ - property bool b: true; \ - }", root, "Instance") - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopy.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopy.var.qml deleted file mode 100644 index 805655fc17..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopy.var.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// Here we import a scarce resource directly. -// The instance has a property which is a copy -// of the scarce resource, so it should not be -// detached (but we should automatically release -// the resource from our engine internal list). - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property var scarceResourceCopy: scarceResourceProvider.scarceResource -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopy.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopy.variant.qml deleted file mode 100644 index ee5b05b28a..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopy.variant.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// Here we import a scarce resource directly. -// The instance has a property which is a copy -// of the scarce resource, so it should not be -// detached (but we should automatically release -// the resource from our engine internal list). - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property variant scarceResourceCopy: scarceResourceProvider.scarceResource -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyFromJs.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyFromJs.var.qml deleted file mode 100644 index 09868e5e7c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyFromJs.var.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.var.js" as ScarceResourceProviderJs - -// Here we import a scarce resource directly, from JS module. -// It is not preserved or released manually, so it should be -// automatically released once evaluation of the binding -// is complete. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property var scarceResourceCopy: ScarceResourceProviderJs.importScarceResource(scarceResourceProvider) -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyFromJs.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyFromJs.variant.qml deleted file mode 100644 index a1ebeb4073..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyFromJs.variant.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.variant.js" as ScarceResourceProviderJs - -// Here we import a scarce resource directly, from JS module. -// It is not preserved or released manually, so it should be -// automatically released once evaluation of the binding -// is complete. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property variant scarceResourceCopy: ScarceResourceProviderJs.importScarceResource(scarceResourceProvider) -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.var.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.var.js deleted file mode 100644 index 468a6b4f2e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.var.js +++ /dev/null @@ -1,25 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -// In this case, the "retn" variable will be evaluated during import. -// Since the "importScarceResource()" function depends on this variable, -// we must explicitly preserve the "retn" variable or the scarce -// resource would automatically be released after import completes -// but before the binding is evaluated. - -var component = Qt.createComponent("scarceResourceCopy.var.qml"); -var scarceResourceElement = component.createObject(null); -var scarceResourceProvider = scarceResourceElement.a; -var retn = scarceResourceProvider.scarceResource; -retn.preserve(); // must preserve manually or it will be released! - -function importScarceResource() { - // if called prior to calling destroyScarceResource(), - // this function should return the preserved scarce resource. - // otherwise, it should return an invalid variant. - return retn; -} - -function destroyScarceResource() { - retn.destroy(); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.var.qml deleted file mode 100644 index 9321481f45..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.var.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceCopyImport.var.js" as ScarceResourceCopyImportJs - -QtObject { - // this binding is evaluated once, prior to the resource being released - property var scarceResourceImportedCopy: ScarceResourceCopyImportJs.importScarceResource() - - property bool arePropertiesEqual - property var scarceResourceAssignedCopyOne; - property var scarceResourceAssignedCopyTwo; - Component.onCompleted: { - scarceResourceAssignedCopyOne = ScarceResourceCopyImportJs.importScarceResource(); - arePropertiesEqual = (scarceResourceAssignedCopyOne == scarceResourceImportedCopy); - ScarceResourceCopyImportJs.destroyScarceResource(); // makes all properties invalid. - scarceResourceAssignedCopyTwo = ScarceResourceCopyImportJs.importScarceResource(); - } -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.variant.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.variant.js deleted file mode 100644 index 9aeb507487..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.variant.js +++ /dev/null @@ -1,25 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -// In this case, the "retn" variable will be evaluated during import. -// Since the "importScarceResource()" function depends on this variable, -// we must explicitly preserve the "retn" variable or the scarce -// resource would automatically be released after import completes -// but before the binding is evaluated. - -var component = Qt.createComponent("scarceResourceCopy.variant.qml"); -var scarceResourceElement = component.createObject(null); -var scarceResourceProvider = scarceResourceElement.a; -var retn = scarceResourceProvider.scarceResource; -retn.preserve(); // must preserve manually or it will be released! - -function importScarceResource() { - // if called prior to calling destroyScarceResource(), - // this function should return the preserved scarce resource. - // otherwise, it should return an invalid variant. - return retn; -} - -function destroyScarceResource() { - retn.destroy(); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.variant.qml deleted file mode 100644 index e8b53979dd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImport.variant.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceCopyImport.variant.js" as ScarceResourceCopyImportJs - -QtObject { - // this binding is evaluated once, prior to the resource being released - property variant scarceResourceImportedCopy: ScarceResourceCopyImportJs.importScarceResource() - - // this code is evaluated on completion, and so copy one should be valid, copy two invalid. - property variant scarceResourceAssignedCopyOne; - property variant scarceResourceAssignedCopyTwo; - Component.onCompleted: { - scarceResourceAssignedCopyOne = ScarceResourceCopyImportJs.importScarceResource(); - ScarceResourceCopyImportJs.destroyScarceResource(); - scarceResourceAssignedCopyTwo = ScarceResourceCopyImportJs.importScarceResource(); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportDifferent.var.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportDifferent.var.js deleted file mode 100644 index 000eeddb34..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportDifferent.var.js +++ /dev/null @@ -1,19 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -// In this case, we create the returned scarce resource each call, -// so the object will be different every time it is returned. - -var mostRecent - -function importScarceResource() { - var component = Qt.createComponent("scarceResourceCopy.var.qml"); - var scarceResourceElement = component.createObject(null); - var scarceResourceProvider = scarceResourceElement.a; - var retn = scarceResourceProvider.scarceResource; - mostRecent = retn; - return retn; -} - -function destroyScarceResource() { - mostRecent.destroy(); -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportDifferent.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportDifferent.var.qml deleted file mode 100644 index 082d132c24..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportDifferent.var.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceCopyImportDifferent.var.js" as ScarceResourceCopyImportJs - -// in this case, the ScarceResourceCopyImportJs returns a _new_, different -// scarce resource each time. Invalidating one will not invalidate the others. - -QtObject { - // this binding is evaluated once, prior to the resource being released - property var scarceResourceImportedCopy: ScarceResourceCopyImportJs.importScarceResource() - - // the following properties are assigned on component completion. - property bool arePropertiesEqual - property var scarceResourceAssignedCopyOne; - property var scarceResourceAssignedCopyTwo; - Component.onCompleted: { - scarceResourceAssignedCopyOne = ScarceResourceCopyImportJs.importScarceResource(); - arePropertiesEqual = (scarceResourceAssignedCopyOne != scarceResourceImportedCopy); // they're not the same object. - ScarceResourceCopyImportJs.destroyScarceResource(); // makes the MOST RECENT resource invalid (ie, assignedCopyOne). - scarceResourceAssignedCopyTwo = ScarceResourceCopyImportJs.importScarceResource(); - } -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.var.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.var.js deleted file mode 100644 index ba52b323f0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.var.js +++ /dev/null @@ -1,19 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -// In this case, the "retn" variable will be evaluated during import. -// Since the importScarceResource() function depends on this variable, -// because we DO NOT call "retn.preserve()", the scarce resource will -// be released after the import completes but prior to evaluation of -// any binding which calls "importScarceResource()". -// Thus, "importScarceResource()" will return a released (invalid) -// scarce resource. - -var component = Qt.createComponent("scarceResourceCopy.var.qml"); -var scarceResourceElement = component.createObject(null); -var scarceResourceProvider = scarceResourceElement.a; -var retn = scarceResourceProvider.scarceResource; - -function importScarceResource() { - return retn; // should return a released (invalid) scarce resource -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.var.qml deleted file mode 100644 index a1a3c1d66f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.var.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceCopyImportFail.var.js" as ScarceResourceCopyImportFailJs - -QtObject { - property var scarceResourceCopy: ScarceResourceCopyImportFailJs.importScarceResource() -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.variant.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.variant.js deleted file mode 100644 index b59b5b1fa9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.variant.js +++ /dev/null @@ -1,19 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -// In this case, the "retn" variable will be evaluated during import. -// Since the importScarceResource() function depends on this variable, -// because we DO NOT call "retn.preserve()", the scarce resource will -// be released after the import completes but prior to evaluation of -// any binding which calls "importScarceResource()". -// Thus, "importScarceResource()" will return a released (invalid) -// scarce resource. - -var component = Qt.createComponent("scarceResourceCopy.variant.qml"); -var scarceResourceElement = component.createObject(null); -var scarceResourceProvider = scarceResourceElement.a; -var retn = scarceResourceProvider.scarceResource; - -function importScarceResource() { - return retn; // should return a released (invalid) scarce resource -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.variant.qml deleted file mode 100644 index 8f6dcd6603..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportFail.variant.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceCopyImportFail.variant.js" as ScarceResourceCopyImportFailJs - -QtObject { - property variant scarceResourceCopy: ScarceResourceCopyImportFailJs.importScarceResource() -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.var.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.var.js deleted file mode 100644 index 130199f78a..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.var.js +++ /dev/null @@ -1,15 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -// In this case, the "retn" variable will be evaluated during import. -// Since the importScarceResource() function depends on this variable, -// because we DO NOT call "retn.preserve()", the scarce resource will -// be released after the import completes but prior to evaluation of -// any binding which calls "importScarceResource()". -// Thus, "importScarceResource()" will return a released (invalid) -// scarce resource. - -var component = Qt.createComponent("scarceResourceCopyNoBinding.var.qml"); -var scarceResourceElement = component.createObject(null); -var scarceResourceProvider = scarceResourceElement.a; -var retn = scarceResourceProvider.scarceResource; - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.var.qml deleted file mode 100644 index 5284b40cc8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.var.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// the following js import doesn't manually preserve or destroy any resources -import "scarceResourceCopyImportNoBinding.var.js" as ScarceResourceCopyImportNoBindingJs - -QtObject { - // in this case, there is an import but no binding evaluated. - // nonetheless, any resources which are not preserved, should - // be automatically released by the engine. -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.variant.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.variant.js deleted file mode 100644 index 14a36a19ea..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.variant.js +++ /dev/null @@ -1,15 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -// In this case, the "retn" variable will be evaluated during import. -// Since the importScarceResource() function depends on this variable, -// because we DO NOT call "retn.preserve()", the scarce resource will -// be released after the import completes but prior to evaluation of -// any binding which calls "importScarceResource()". -// Thus, "importScarceResource()" will return a released (invalid) -// scarce resource. - -var component = Qt.createComponent("scarceResourceCopyNoBinding.variant.qml"); -var scarceResourceElement = component.createObject(null); -var scarceResourceProvider = scarceResourceElement.a; -var retn = scarceResourceProvider.scarceResource; - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.variant.qml deleted file mode 100644 index 826cbe49fc..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyImportNoBinding.variant.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// the following js import doesn't manually preserve or destroy any resources -import "scarceResourceCopyImportNoBinding.variant.js" as ScarceResourceCopyImportNoBindingJs - -QtObject { - // in this case, there is an import but no binding evaluated. - // nonetheless, any resources which are not preserved, should - // be automatically released by the engine. -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyNoBinding.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyNoBinding.var.qml deleted file mode 100644 index 4adef39980..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyNoBinding.var.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -QtObject { - // this component doesn't bind any property to a scarce - // resource from the scarce resource provider, - // so the binding evaluation resource cleanup - // codepath shouldn't be activated; so if the resources - // are released, it will be due to the import evaluation - // resource cleanup codepath being activated correctly. - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyNoBinding.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyNoBinding.variant.qml deleted file mode 100644 index 4adef39980..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceCopyNoBinding.variant.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -QtObject { - // this component doesn't bind any property to a scarce - // resource from the scarce resource provider, - // so the binding evaluation resource cleanup - // codepath shouldn't be activated; so if the resources - // are released, it will be due to the import evaluation - // resource cleanup codepath being activated correctly. - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceDestroyedCopy.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceDestroyedCopy.var.qml deleted file mode 100644 index 500f5d5bd7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceDestroyedCopy.var.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.var.js" as ScarceResourceProviderJs - -// In this case, following the evaluation of the binding, -// the scarceResourceTest value should be an invalid variant, -// since the scarce resource will have been released. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property var scarceResourceCopy: ScarceResourceProviderJs.importReleasedScarceResource(scarceResourceProvider); -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceDestroyedCopy.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceDestroyedCopy.variant.qml deleted file mode 100644 index 7a3b845247..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceDestroyedCopy.variant.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.variant.js" as ScarceResourceProviderJs - -// In this case, following the evaluation of the binding, -// the scarceResourceTest value should be an invalid variant, -// since the scarce resource will have been released. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property variant scarceResourceCopy: ScarceResourceProviderJs.importReleasedScarceResource(scarceResourceProvider); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunction.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunction.var.qml deleted file mode 100644 index 23e4c8d15e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunction.var.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// Here we import a scarce resource directly. -// The copy is only assigned when retrieveScarceResource() -// is called, and so should be detached prior to that. -// The copy should be released when releaseScarceResource() -// is called, and so should be detached after that. - -QtObject { - id: root - property MyScarceResourceObject a: MyScarceResourceObject { id: scarceResourceProvider } - property var scarceResourceCopy; - - function retrieveScarceResource() { - root.scarceResourceCopy = scarceResourceProvider.scarceResource; - } - - function releaseScarceResource() { - root.scarceResourceCopy = null; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunction.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunction.variant.qml deleted file mode 100644 index fe3707b5d3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunction.variant.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// Here we import a scarce resource directly. -// The copy is only assigned when retrieveScarceResource() -// is called, and so should be detached prior to that. -// The copy should be released when releaseScarceResource() -// is called, and so should be detached after that. - -QtObject { - id: root - property MyScarceResourceObject a: MyScarceResourceObject { id: scarceResourceProvider } - property variant scarceResourceCopy; - - function retrieveScarceResource() { - root.scarceResourceCopy = scarceResourceProvider.scarceResource; - } - - function releaseScarceResource() { - root.scarceResourceCopy = null; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunctionFail.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunctionFail.var.qml deleted file mode 100644 index 7b4463773c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunctionFail.var.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// In this example, a common syntax error will only be "caught" -// when the function is called via: -// QDeclarativeVMEMetaObject::metaCall->invokeMetaMethod() -// We would like to ensure that a useful error message is printed. - -QtObject { - id: root - property MyScarceResourceObject a: MyScarceResourceObject { id: scarceResourceProvider } - property var scarceResourceCopy; - property string srp_name: a.toString(); - - function retrieveScarceResource() { - root.scarceResourceCopy = scarceResourceProvider.scarceResource(); // common syntax error, should throw exception - } - - function releaseScarceResource() { - root.scarceResourceCopy = null; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunctionFail.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunctionFail.variant.qml deleted file mode 100644 index 45acc53e63..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceFunctionFail.variant.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// In this example, a common syntax error will only be "caught" -// when the function is called via: -// QDeclarativeVMEMetaObject::metaCall->invokeMetaMethod() -// We would like to ensure that a useful error message is printed. - -QtObject { - id: root - property MyScarceResourceObject a: MyScarceResourceObject { id: scarceResourceProvider } - property variant scarceResourceCopy; - property string srp_name: a.toString(); - - function retrieveScarceResource() { - root.scarceResourceCopy = scarceResourceProvider.scarceResource(); // common syntax error, should throw exception - } - - function releaseScarceResource() { - root.scarceResourceCopy = null; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleDifferentNoBinding.var.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleDifferentNoBinding.var.js deleted file mode 100644 index 217f693456..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleDifferentNoBinding.var.js +++ /dev/null @@ -1,14 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -function importScarceResource() { - var component = Qt.createComponent("scarceResourceCopy.var.qml"); - var scarceResourceElement = component.createObject(null); - var scarceResourceProvider = scarceResourceElement.a; - var retn = scarceResourceProvider.scarceResource; - retn.preserve(); - return retn; -} - -function releaseScarceResource(resource) { - resource.destroy(); -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleDifferentNoBinding.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleDifferentNoBinding.var.qml deleted file mode 100644 index 205131661f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleDifferentNoBinding.var.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceMultipleDifferentNoBinding.var.js" as ScarceResourcesMultipleDifferentNoBinding - -QtObject { - property var resourceOne - property var resourceTwo - - Component.onCompleted: { - resourceOne = ScarceResourcesMultipleDifferentNoBinding.importScarceResource(); - resourceTwo = ScarceResourcesMultipleDifferentNoBinding.importScarceResource(); - ScarceResourcesMultipleDifferentNoBinding.releaseScarceResource(resourceTwo); - } -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameNoBinding.var.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameNoBinding.var.js deleted file mode 100644 index 5b2494c8e6..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameNoBinding.var.js +++ /dev/null @@ -1,15 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -var component = Qt.createComponent("scarceResourceCopy.var.qml"); -var scarceResourceElement = component.createObject(null); -var scarceResourceProvider = scarceResourceElement.a; -var retn = scarceResourceProvider.scarceResource; -retn.preserve(); - -function importScarceResource() { - return retn; -} - -function releaseScarceResource(resource) { - resource.destroy(); -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameNoBinding.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameNoBinding.var.qml deleted file mode 100644 index e7f6d7868f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameNoBinding.var.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceMultipleSameNoBinding.var.js" as ScarceResourcesMultipleSameNoBinding - -QtObject { - property var resourceOne - property var resourceTwo - - Component.onCompleted: { - resourceOne = ScarceResourcesMultipleSameNoBinding.importScarceResource(); - resourceTwo = ScarceResourcesMultipleSameNoBinding.importScarceResource(); - ScarceResourcesMultipleSameNoBinding.releaseScarceResource(resourceTwo); - } -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameWithBinding.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameWithBinding.var.qml deleted file mode 100644 index 34cb97f39c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceMultipleSameWithBinding.var.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceMultipleDifferentNoBinding.var.js" as ScarceResourcesMultipleDifferentNoBinding - -QtObject { - property var resourceOne: ScarceResourcesMultipleDifferentNoBinding.importScarceResource() - property var resourceTwo: resourceOne - - Component.onCompleted: { - ScarceResourcesMultipleDifferentNoBinding.releaseScarceResource(resourceTwo); - } -}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceObjectGc.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceObjectGc.var.qml deleted file mode 100644 index 7ec98e6619..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceObjectGc.var.qml +++ /dev/null @@ -1,30 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: testScarce - - property var varProperty - - property var canary: 4 - - // constructs an Item which contains a scarce resource. - function constructScarceObject() { - var retn = 1; - var component = Qt.createComponent("ScarceResourceVarComponent.qml"); - if (component.status == Component.Ready) { - retn = component.createObject(null); // has JavaScript ownership - } - return retn; - } - - function assignVarProperty() { - varProperty = constructScarceObject(); - gc(); - } - - function deassignVarProperty() { - varProperty = 2; // causes the original object to be garbage collected. - gc(); // image should be detached; ep->sr should be empty! - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceSignal.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceSignal.var.qml deleted file mode 100644 index 0b30e88fa8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceSignal.var.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -QtObject { - id: root - - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - - property ScarceResourceSignalComponentVar b; - b: ScarceResourceSignalComponentVar { - objectName: "srsc" - - onTestSignal: { - // this signal will be invoked manually in the test. - // the scarce resource should be released automatically after evaluation - // and since we don't keep a copy of it, the pixmap will be detached. - width = (scarceResourceProvider.scarceResource,10) - } - - onTestSignal2: { - // this signal will be invoked manually in the test. - // the scarce resource should be released automatically after evaluation - // but since we assign it to a property, the pixmap won't be detached. - scarceResourceCopy = scarceResourceProvider.scarceResource - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceSignal.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceSignal.variant.qml deleted file mode 100644 index 1011c7e240..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceSignal.variant.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -QtObject { - id: root - - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - - property ScarceResourceSignalComponentVariant b; - b: ScarceResourceSignalComponentVariant { - objectName: "srsc" - - onTestSignal: { - // this signal will be invoked manually in the test. - // the scarce resource should be released automatically after evaluation - // and since we don't keep a copy of it, the pixmap will be detached. - width = (scarceResourceProvider.scarceResource,10) - } - - onTestSignal2: { - // this signal will be invoked manually in the test. - // the scarce resource should be released automatically after evaluation - // but since we assign it to a property, the pixmap won't be detached. - scarceResourceCopy = scarceResourceProvider.scarceResource - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.var.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.var.js deleted file mode 100644 index c904eb3564..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.var.js +++ /dev/null @@ -1,48 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -function importScarceResource(scarceResourceProvider) { - // the scarce resource should be automatically released - // after the binding is evaluated if preserve is not - // called. - return scarceResourceProvider.scarceResource; -} - -function importPreservedScarceResource(scarceResourceProvider) { - // the scarce resource is manually preserved - // during the evaluation of the binding. - // it should not be released. - var scarceResource = scarceResourceProvider.scarceResource; - scarceResource.preserve(); - return scarceResource; -} - -function importReleasedScarceResource(scarceResourceProvider) { - // release the scarce resource during the - // evaluation of the binding. The returned - // variant will therefore be invalid. - var scarceResource = scarceResourceProvider.scarceResource; - scarceResource.destroy(); - return scarceResource; -} - -function importPreservedScarceResourceFromMultiple(scarceResourceProvider) { - // some scarce resources are manually preserved, - // some of them are manually destroyed, - // and some are automatically managed. - // We return a preserved resource - var sr1 = scarceResourceProvider.scarceResource; // preserved/destroyed. - sr1.preserve(); - var sr2 = scarceResourceProvider.scarceResource; // preserved/destroyed - sr2.preserve(); - var sr3 = scarceResourceProvider.scarceResource; // automatic. - var sr4 = scarceResourceProvider.scarceResource; // automatic and returned. - var sr5 = scarceResourceProvider.scarceResource; // destroyed - sr5.destroy(); - sr2.destroy(); - var sr6 = scarceResourceProvider.scarceResource; // destroyed - var sr7 = scarceResourceProvider.scarceResource; // automatic - sr1.destroy(); - sr6.destroy(); - return sr4; -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.var.qml deleted file mode 100644 index 1d4e67055e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.var.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// Here we import a scarce resource directly, and use it in a binding. -// It is not preserved or released manually, so it should be -// automatically released once evaluation of the binding -// is complete. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property int scarceResourceTest: scarceResourceProvider.scarceResource,100 // return 100, but include the scarceResource in the binding to be evaluated. -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.variant.js b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.variant.js deleted file mode 100644 index c904eb3564..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.variant.js +++ /dev/null @@ -1,48 +0,0 @@ -.import Qt.test 1.0 as JsQtTest - -function importScarceResource(scarceResourceProvider) { - // the scarce resource should be automatically released - // after the binding is evaluated if preserve is not - // called. - return scarceResourceProvider.scarceResource; -} - -function importPreservedScarceResource(scarceResourceProvider) { - // the scarce resource is manually preserved - // during the evaluation of the binding. - // it should not be released. - var scarceResource = scarceResourceProvider.scarceResource; - scarceResource.preserve(); - return scarceResource; -} - -function importReleasedScarceResource(scarceResourceProvider) { - // release the scarce resource during the - // evaluation of the binding. The returned - // variant will therefore be invalid. - var scarceResource = scarceResourceProvider.scarceResource; - scarceResource.destroy(); - return scarceResource; -} - -function importPreservedScarceResourceFromMultiple(scarceResourceProvider) { - // some scarce resources are manually preserved, - // some of them are manually destroyed, - // and some are automatically managed. - // We return a preserved resource - var sr1 = scarceResourceProvider.scarceResource; // preserved/destroyed. - sr1.preserve(); - var sr2 = scarceResourceProvider.scarceResource; // preserved/destroyed - sr2.preserve(); - var sr3 = scarceResourceProvider.scarceResource; // automatic. - var sr4 = scarceResourceProvider.scarceResource; // automatic and returned. - var sr5 = scarceResourceProvider.scarceResource; // destroyed - sr5.destroy(); - sr2.destroy(); - var sr6 = scarceResourceProvider.scarceResource; // destroyed - var sr7 = scarceResourceProvider.scarceResource; // automatic - sr1.destroy(); - sr6.destroy(); - return sr4; -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.variant.qml deleted file mode 100644 index 1d4e67055e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTest.variant.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -// Here we import a scarce resource directly, and use it in a binding. -// It is not preserved or released manually, so it should be -// automatically released once evaluation of the binding -// is complete. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property int scarceResourceTest: scarceResourceProvider.scarceResource,100 // return 100, but include the scarceResource in the binding to be evaluated. -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestMultiple.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestMultiple.var.qml deleted file mode 100644 index 5e6c2d97f9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestMultiple.var.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.var.js" as ScarceResourceProviderJs - -// In this case, multiple scarce resource are explicity preserved -// and then explicitly destroyed, while others are automatically -// managed. Since none are manually preserved without subsequently -// being destroyed, after the evaluation of the binding the -// scarce resource should be detached. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property int scarceResourceTest: ScarceResourceProviderJs.importPreservedScarceResourceFromMultiple(scarceResourceProvider), 100 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestMultiple.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestMultiple.variant.qml deleted file mode 100644 index 2970bcb26c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestMultiple.variant.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.variant.js" as ScarceResourceProviderJs - -// In this case, multiple scarce resource are explicity preserved -// and then explicitly destroyed, while others are automatically -// managed. Since none are manually preserved without subsequently -// being destroyed, after the evaluation of the binding the -// scarce resource should be detached. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property int scarceResourceTest: ScarceResourceProviderJs.importPreservedScarceResourceFromMultiple(scarceResourceProvider), 100 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestPreserve.var.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestPreserve.var.qml deleted file mode 100644 index 9e9495c0fa..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestPreserve.var.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.var.js" as ScarceResourceProviderJs - -// In this case, the scarce resource is explicity preserved. -// It should not be automatically released after the evaluation -// of the binding is complete, but instead will be kept in -// memory until the JS garbage collector runs. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property int scarceResourceTest: ScarceResourceProviderJs.importPreservedScarceResource(scarceResourceProvider),100 // return 100, but the resource should be preserved. -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestPreserve.variant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestPreserve.variant.qml deleted file mode 100644 index 022067beca..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scarceResourceTestPreserve.variant.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 -import "scarceResourceTest.variant.js" as ScarceResourceProviderJs - -// In this case, the scarce resource is explicity preserved. -// It should not be automatically released after the evaluation -// of the binding is complete, but instead will be kept in -// memory until the JS garbage collector runs. - -QtObject { - property MyScarceResourceObject a; - a: MyScarceResourceObject { id: scarceResourceProvider } - property int scarceResourceTest: ScarceResourceProviderJs.importPreservedScarceResource(scarceResourceProvider),100 // return 100, but the resource should be preserved. -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml deleted file mode 100644 index fe1c4c7931..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml +++ /dev/null @@ -1,40 +0,0 @@ -import QtQuick 2.0 - -Item { - property int a: 0 - property int b: 14 - - function b() { return 11; } - function c() { return 33; } - - QtObject { - id: a - property int value: 19 - } - - QtObject { - id: c - property int value: 24 - } - - QtObject { - id: nested - property int a: 1 - property int test: a.value - property int test2: b - property int test3: c.value - } - - - // id takes precedence over local, and root properties - property int test1: a.value - property alias test2: nested.test - - // properties takes precedence over local, and root methods - property int test3: b - property alias test4: nested.test2 - - // id takes precedence over methods - property int test5: c.value - property alias test6: nested.test3 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml deleted file mode 100644 index 9add81809c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - id: root - - property int foo: 12 - - property bool test1: foo == 12 - property bool test2: console != 11 - property bool test3: root.console == 11 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.4.qml deleted file mode 100644 index d65b6e7c7c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.4.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - id: a - property int b: 9 - - property int test - property string test2 - - // Should resolve to signal arguments, not to other elements in the file - onArgumentSignal: { test = a; test2 = b; } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.5.qml deleted file mode 100644 index 6dbcbe2a40..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.5.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 - -Item { - property bool test1: false; - property bool test2: false; - - property int a: 10 - - Item { - id: nested - property int a: 11 - - function mynestedfunction() { - return a; - } - } - - function myouterfunction() { - return a; - } - - Component.onCompleted: { - test1 = (myouterfunction() == 10); - test2 = (nested.mynestedfunction() == 11); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.6.qml deleted file mode 100644 index 5897b533d7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.6.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -Item { - id: me - property bool test: nested.runtest(me); - - Scope6Nested { - id: nested - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml deleted file mode 100644 index a00352b684..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml +++ /dev/null @@ -1,44 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - - property int a: 1 - property int binding: a - property string binding2: a + "Test" - property int binding3: myFunction() - property int binding4: nestedObject.myNestedFunction() - - function myFunction() { - return a; - } - - Item { - id: nestedObject - - function myNestedFunction() { - return a; - } - - property int a: 2 - property int binding: a - property string binding2: a + "Test" - property int binding3: myFunction() - property int binding4: myNestedFunction() - } - - ScopeObject { - id: compObject - } - - property alias test1: root.binding - property alias test2: nestedObject.binding - property alias test3: root.binding2 - property alias test4: nestedObject.binding2 - property alias test5: root.binding3 - property alias test6: nestedObject.binding3 - property alias test7: root.binding4 - property alias test8: nestedObject.binding4 - property alias test9: compObject.binding - property alias test10: compObject.binding2 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.js deleted file mode 100644 index 54284fea47..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.js +++ /dev/null @@ -1,4 +0,0 @@ -function testFunction() { - test = true; -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml deleted file mode 100644 index ace473756e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 -import "scriptConnect.1.js" as Script -MyQmlObject { - property bool test: false - - id: root - - Component.onCompleted: root.argumentSignal.connect(Script.testFunction); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.js deleted file mode 100644 index 595c778aa7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.js +++ /dev/null @@ -1,5 +0,0 @@ -function testFunction() { - if (this.b == 12) - test = true; -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml deleted file mode 100644 index cdf2d6ad98..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml +++ /dev/null @@ -1,16 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 -import "scriptConnect.2.js" as Script - -MyQmlObject { - property bool test: false - - id: root - - Component.onCompleted: { - var a = new Object; - a.b = 12; - root.argumentSignal.connect(a, Script.testFunction); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml deleted file mode 100644 index b0e40565c0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml +++ /dev/null @@ -1,15 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - property bool test: false - - id: root - - function testFunction() { - test = true; - } - - Component.onCompleted: root.argumentSignal.connect(testFunction); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml deleted file mode 100644 index ef5331c94a..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - property bool test: false - - id: root - - Component.onCompleted: root.argumentSignal.connect(methodNoArgs); -} - - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml deleted file mode 100644 index 8dcacbcbb7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - property bool test: false - - id: root - - Component.onCompleted: root.argumentSignal.connect(root, methodNoArgs); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.js deleted file mode 100644 index 71bdd088a2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.js +++ /dev/null @@ -1,3 +0,0 @@ -function testFunction() { - test++; -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml deleted file mode 100644 index 06b6f0fa62..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml +++ /dev/null @@ -1,15 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 -import "scriptConnect.6.js" as Script - -MyQmlObject { - property int test: 0 - - id: root - - Component.onCompleted: { - root.argumentSignal.connect(Script.testFunction); - root.argumentSignal.connect(Script.testFunction); - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.js deleted file mode 100644 index 407426fcd1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.js +++ /dev/null @@ -1,6 +0,0 @@ -function testFunction() { - test++; -} - -function otherFunction() { -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml deleted file mode 100644 index e546ee44d8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 -import "scriptDisconnect.1.js" as Script - -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 deleted file mode 100644 index e70cd8b900..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 -import "scriptDisconnect.1.js" as Script - -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 deleted file mode 100644 index 6f47776ea5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 -import "scriptDisconnect.1.js" as Script - -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 deleted file mode 100644 index b3887545fb..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 -import "scriptDisconnect.1.js" as Script - -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 deleted file mode 100644 index d22f623edb..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js +++ /dev/null @@ -1,4 +0,0 @@ -// Comment -a = 10 - -function getValue() { a = 10; return 0; } diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml deleted file mode 100644 index 4998f63929..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml +++ /dev/null @@ -1,18 +0,0 @@ -import Qt.test 1.0 -import "scriptErrors.js" as Script - -MyQmlObject { - property int t: a.value - property int w: Script.getValue(); - property int d: undefined - ? 0 // multi-line binding - : 1 - property int x: undefined - property int y: (a.value, undefinedObject) - - onBasicSignal: { console.log(a.value); } - id: myObj - onAnotherBasicSignal: myObj.trueProperty = false; - onThirdBasicSignal: myObj.fakeProperty = ""; -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml deleted file mode 100644 index 58cf8051f0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml +++ /dev/null @@ -1,17 +0,0 @@ -import Qt.test 1.0 - -MyQmlContainer { - property bool triggerDelete: false - - children: [ - MyQmlObject { - // Will trigger deletion on binding assignment - deleteOnSet: Math.max(0, 1) - }, - - MyQmlObject { - // Will trigger deletion on binding assignment, but after component creation - deleteOnSet: if (triggerDelete) 1; else 0; - } - ] -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml deleted file mode 100644 index 074851a67b..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml +++ /dev/null @@ -1,18 +0,0 @@ -import Qt.test 1.0 - -MyQmlContainer { - property bool triggerDelete: false - - children: [ - MyQmlObject { - // Will trigger deletion during binding evaluation - stringProperty: {deleteMe(), "Hello"} - }, - - MyQmlObject { - // Will trigger deletion during binding evaluation, but after component creation - stringProperty: if (triggerDelete) { deleteMe(), "Hello" } else { "World" } - } - - ] -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.array.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.array.qml deleted file mode 100644 index 52abda1e55..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.array.qml +++ /dev/null @@ -1,193 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - property bool success: false - - property variant intList - property variant qrealList - property variant boolList - property variant stringList - - function indexedAccess() { - intList = msco.intListProperty; - var jsIntList = msco.intListProperty; - qrealList = msco.qrealListProperty; - var jsQrealList = msco.qrealListProperty; - boolList = msco.boolListProperty; - var jsBoolList = msco.boolListProperty; - stringList = msco.stringListProperty; - var jsStringList = msco.stringListProperty; - - // Three cases: direct property modification, variant copy modification, js var reference modification. - // Only the first and third should "write back" to the original QObject Q_PROPERTY; the second one - // should have no effect whatsoever to maintain "property variant" semantics (see e.g., valuetype). - success = true; - - msco.intListProperty[1] = 33; - if (msco.intListProperty[1] != 33) success = false; // ensure write back - intList[1] = 44; - if (intList[1] == 44) success = false; // ensure no effect - jsIntList[1] = 55; - if (jsIntList[1] != 55 - || jsIntList[1] != msco.intListProperty[1]) success = false; // ensure write back - - msco.qrealListProperty[1] = 33.3; - if (msco.qrealListProperty[1] != 33.3) success = false; // ensure write back - qrealList[1] = 44.4; - if (qrealList[1] == 44.4) success = false; // ensure no effect - jsQrealList[1] = 55.5; - if (jsQrealList[1] != 55.5 - || jsQrealList[1] != msco.qrealListProperty[1]) success = false; // ensure write back - - msco.boolListProperty[1] = true; - if (msco.boolListProperty[1] != true) success = false; // ensure write back - boolList[1] = true; - if (boolList[1] != false) success = false; // ensure no effect - jsBoolList[1] = false; - if (jsBoolList[1] != false - || jsBoolList[1] != msco.boolListProperty[1]) success = false; // ensure write back - - msco.stringListProperty[1] = "changed"; - if (msco.stringListProperty[1] != "changed") success = false; // ensure write back - stringList[1] = "changed"; - if (stringList[1] != "second") success = false; // ensure no effect - jsStringList[1] = "different"; - if (jsStringList[1] != "different" - || jsStringList[1] != msco.stringListProperty[1]) success = false; // ensure write back - } - - function arrayOperations() { - success = true; - var expected = 0; - var expectedStr = ""; - - // ecma262r3 defines array as implementing Length and Put. Test put here. - msco.intListProperty.asdf = 5; // shouldn't work, only indexes are valid names. - if (msco.intListProperty.asdf == 5) success = false; - msco.intListProperty[3] = 38; // should work. - if (msco.intListProperty[3] != 38) success = false; - msco.intListProperty[199] = 200; // should work, and should set length to 200. - if (msco.intListProperty[199] != 200) success = false; - if (msco.intListProperty.length != 200) success = false; - - // test indexed deleter - msco.intListProperty = [ 1, 2, 3, 4, 5 ]; - delete msco.intListProperty[-1]; - expected = [ 1, 2, 3, 4, 5 ]; - if (msco.intListProperty.toString() != expected.toString()) success = false; - delete msco.intListProperty[0]; - expected = [ 0, 2, 3, 4, 5 ]; - if (msco.intListProperty.toString() != expected.toString()) success = false; - delete msco.intListProperty[2]; - expected = [ 0, 2, 0, 4, 5 ]; - if (msco.intListProperty.toString() != expected.toString()) success = false; - delete msco.intListProperty[7]; - expected = [ 0, 2, 0, 4, 5 ]; - if (msco.intListProperty.toString() != expected.toString()) success = false; - - // other operations are defined on the array prototype; see if they work. - - // splice - msco.intListProperty = [ 0, 1, 2, 3, 4, 5, 6, 7 ]; - msco.intListProperty.splice(1,3, 33, 44, 55, 66); - expected = [ 0, 33, 44, 55, 66, 4, 5, 6, 7 ]; - if (msco.intListProperty.toString() != expected.toString()) success = false; - msco.intListProperty = [ 0, 1, 2, 3, 4, 5, 6, 7 ]; - msco.intListProperty.splice(1, 3); - expected = [ 0, 4, 5, 6, 7 ]; - if (msco.intListProperty.toString() != expected.toString()) success = false; - - msco.qrealListProperty = [ 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1 ]; - msco.qrealListProperty.splice(1,3, 33.33, 44.44, 55.55, 66.66); - expected = [ 0.1, 33.33, 44.44, 55.55, 66.66, 4.1, 5.1, 6.1, 7.1 ]; - if (msco.qrealListProperty.toString() != expected.toString()) success = false; - msco.qrealListProperty = [ 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1 ]; - msco.qrealListProperty.splice(1,3); - expected = [ 0.1, 4.1, 5.1, 6.1, 7.1 ]; - if (msco.qrealListProperty.toString() != expected.toString()) success = false; - - msco.boolListProperty = [ false, true, true, false, false, true, false, true ]; - msco.boolListProperty.splice(1,3, false, true, false, false); - expected = [ false, false, true, false, false, false, true, false, true ]; - if (msco.boolListProperty.toString() != expected.toString()) success = false; - msco.boolListProperty = [ false, true, true, false, false, true, false, true ]; - msco.boolListProperty.splice(1,3); - expected = [ false, false, true, false, true ]; - if (msco.boolListProperty.toString() != expected.toString()) success = false; - - msco.stringListProperty = [ "one", "two", "three", "four", "five", "six", "seven", "eight" ]; - msco.stringListProperty.splice(1,3, "nine", "ten", "eleven", "twelve"); - expected = [ "one", "nine", "ten", "eleven", "twelve", "five", "six", "seven", "eight" ]; - if (msco.stringListProperty.toString() != expected.toString()) success = false; - msco.stringListProperty = [ "one", "two", "three", "four", "five", "six", "seven", "eight" ]; - msco.stringListProperty.splice(0,3); - expected = [ "four", "five", "six", "seven", "eight" ]; - if (msco.stringListProperty.toString() != expected.toString()) success = false; - - // pop - msco.intListProperty = [ 0, 1, 2, 3, 4, 5, 6, 7 ]; - var poppedVal = msco.intListProperty.pop(); - expected = [ 0, 1, 2, 3, 4, 5, 6 ]; - if (msco.intListProperty.toString() != expected.toString()) success = false; - expected = 7; - if (poppedVal != expected) success = false; - } - - property variant variantList: [ 1, 2, 3, 4, 5 ]; - property variant variantList2: [ 1, 2, 3, 4, 5 ]; - function testEqualitySemantics() { - // ensure equality semantics match JS array equality semantics - success = true; - - msco.intListProperty = [ 1, 2, 3, 4, 5 ]; - msco.intListProperty2 = [ 1, 2, 3, 4, 5 ]; - var jsIntList = [ 1, 2, 3, 4, 5 ]; - var jsIntList2 = [ 1, 2, 3, 4, 5 ]; - - if (jsIntList != jsIntList) success = false; - if (jsIntList == jsIntList2) success = false; - if (jsIntList == msco.intListProperty) success = false; - if (jsIntList == variantList) success = false; - - if (msco.intListProperty != msco.intListProperty) success = false; - if (msco.intListProperty == msco.intListProperty2) success = false; - if (msco.intListProperty == jsIntList) success = false; - if (msco.intListProperty == variantList) success = false; - - if (variantList == variantList) return false; - if (variantList == variantList2) return false; - if (variantList == msco.intListProperty) return false; - if (variantList == jsIntList) return false; - - if ((jsIntList == jsIntList2) != (jsIntList == msco.intListProperty)) success = false; - if ((jsIntList == jsIntList2) != (msco.intListProperty == msco.intListProperty2)) success = false; - if ((jsIntList == jsIntList) != (msco.intListProperty == msco.intListProperty)) success = false; - if ((jsIntList == variantList) != (msco.intListProperty == variantList)) success = false; - if ((variantList == jsIntList) != (variantList == msco.intListProperty)) success = false; - if ((msco.intListProperty == variantList) != (variantList == msco.intListProperty)) success = false; - } - - property bool referenceDeletion: false - function testReferenceDeletion() { - referenceDeletion = true; - var testObj = msco.generateTestObject(); - testObj.intListProperty = [1, 2, 3, 4, 5]; - var testSequence = testObj.intListProperty; - var prevString = testSequence.toString(); - var prevValueOf = testSequence.valueOf(); - var prevLength = testSequence.length; - msco.deleteTestObject(testObj); // delete referenced object. - if (testSequence.toString() == prevString) referenceDeletion = false; - if (testSequence.valueOf() == prevValueOf) referenceDeletion = false; - if (testSequence.length == prevLength) referenceDeletion = false; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.bindings.error.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.bindings.error.qml deleted file mode 100644 index 9c87dd293e..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.bindings.error.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - intListProperty: [ 1, 2, 3, 6, 7 ] - } - - MySequenceConversionObject { - id: mscoTwo - objectName: "mscoTwo" - boolListProperty: msco.intListProperty - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.bindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.bindings.qml deleted file mode 100644 index 8d83e9f9f5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.bindings.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - intListProperty: [ 1, 2, 3, 6, 7 ] - } - - MySequenceConversionObject { - id: mscoTwo - objectName: "mscoTwo" - intListProperty: msco.intListProperty - } - - property variant boundSequence: msco.intListProperty - property int boundElement: msco.intListProperty[3] - property variant boundSequenceTwo: mscoTwo.intListProperty - - Component.onCompleted: { - msco.intListProperty[3] = 12; - mscoTwo.intListProperty[4] = 14; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.copy.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.copy.qml deleted file mode 100644 index f6614dad0c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.copy.qml +++ /dev/null @@ -1,160 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - property bool success: true - - property variant intList - property variant qrealList - property variant boolList - property variant stringList - property variant urlList - property variant qstringList - - // this test ensures that the "copy resource" codepaths work - function testCopySequences() { - success = true; - - // create "copy resource" sequences - var jsIntList = msco.generateIntSequence(); - var jsQrealList = msco.generateQrealSequence(); - var jsBoolList = msco.generateBoolSequence(); - var jsStringList = msco.generateStringSequence(); - var jsUrlList = msco.generateUrlSequence(); - var jsQStringList = msco.generateQStringSequence(); - - if (jsIntList.toString() != [1, 2, 3].toString()) - success = false; - if (jsQrealList.toString() != [1.1, 2.2, 3.3].toString()) - success = false; - if (jsBoolList.toString() != [true, false, true].toString()) - success = false; - if (jsStringList.toString() != ["one", "two", "three"].toString()) - success = false; - if (jsUrlList.toString() != ["http://www.example1.com", "http://www.example2.com", "http://www.example3.com"].toString()) - success = false; - if (jsQStringList.toString() != ["one", "two", "three"].toString()) - success = false; - - // copy the sequence; should result in a new copy - intList = jsIntList; - qrealList = jsQrealList; - boolList = jsBoolList; - stringList = jsStringList; - urlList = jsUrlList; - qstringList = jsQStringList; - - // these operations shouldn't modify either variables - because - // we don't handle writing to the intermediate variant at list[index] - // for variant properties. - intList[1] = 8; - qrealList[1] = 8.8; - boolList[1] = true; - stringList[1] = "eight"; - urlList[1] = "http://www.example8.com"; - qstringList[1] = "eight"; - - if (jsIntList[1] == 8) - success = false; - if (jsQrealList[1] == 8.8) - success = false; - if (jsBoolList[1] == true) - success = false; - if (jsStringList[1] == "eight") - success = false; - if (jsUrlList[1] == "http://www.example8.com") - success = false; - if (jsQStringList[1] == "eight") - success = false; - - // assign a "copy resource" sequence to a QObject Q_PROPERTY - msco.intListProperty = intList; - msco.qrealListProperty = qrealList; - msco.boolListProperty = boolList; - msco.stringListProperty = stringList; - msco.urlListProperty = urlList; - msco.qstringListProperty = qstringList; - - if (msco.intListProperty.toString() != [1, 2, 3].toString()) - success = false; - if (msco.qrealListProperty.toString() != [1.1, 2.2, 3.3].toString()) - success = false; - if (msco.boolListProperty.toString() != [true, false, true].toString()) - success = false; - if (msco.stringListProperty.toString() != ["one", "two", "three"].toString()) - success = false; - if (msco.urlListProperty.toString() != ["http://www.example1.com", "http://www.example2.com", "http://www.example3.com"].toString()) - success = false; - if (msco.qstringListProperty.toString() != ["one", "two", "three"].toString()) - success = false; - - // now modify the QObject Q_PROPERTY (reference resource) sequences - shouldn't modify the copy resource sequences. - msco.intListProperty[2] = 9; - msco.qrealListProperty[2] = 9.9; - msco.boolListProperty[2] = false; - msco.stringListProperty[2] = "nine"; - msco.urlListProperty[2] = "http://www.example9.com"; - msco.qstringListProperty[2] = "nine"; - - if (intList[2] == 9) - success = false; - if (qrealList[2] == 9.9) - success = false; - if (boolList[2] == false) - success = false; - if (stringList[2] == "nine") - success = false; - if (urlList[2] == "http://www.example9.com") - success = false; - if (qstringList[2] == "nine") - success = false; - } - - property int intVal - property real qrealVal - property bool boolVal - property string stringVal - - // this test ensures that indexed access works for copy resource sequences. - function readSequenceCopyElements() { - success = true; - - var jsIntList = msco.generateIntSequence(); - var jsQrealList = msco.generateQrealSequence(); - var jsBoolList = msco.generateBoolSequence(); - var jsStringList = msco.generateStringSequence(); - - intVal = jsIntList[1]; - qrealVal = jsQrealList[1]; - boolVal = jsBoolList[1]; - stringVal = jsStringList[1]; - - if (intVal != 2) - success = false; - if (qrealVal != 2.2) - success = false; - if (boolVal != false) - success = false; - if (stringVal != "two") - success = false; - } - - // this test ensures that equality works for copy resource sequences. - function testEqualitySemantics() { - success = true; - - var jsIntList = msco.generateIntSequence(); - var jsIntList2 = msco.generateIntSequence(); - - if (jsIntList == jsIntList2) success = false; - if (jsIntList != jsIntList) success = false; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.indexes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.indexes.qml deleted file mode 100644 index 23f1e90417..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.indexes.qml +++ /dev/null @@ -1,89 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - property bool success: false - - function verifyExpected(array, idx) { - for (var i = 0; i < idx; ++i) { - if (array[i] != i) { - return false; - } - } - return true; - } - - function indexedAccess() { - success = true; - - msco.intListProperty = [ 0, 1, 2, 3, 4 ]; - var expectedLength = msco.intListProperty.length; - var maxIndex = msco.maxIndex; - var tooBigIndex = msco.tooBigIndex; - var negativeIndex = msco.negativeIndex; - - // shouldn't be able to set the length > maxIndex. - msco.intListProperty.length = tooBigIndex; - if (msco.intListProperty.length != expectedLength) - success = false; - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - - // shouldn't be able to set any index > maxIndex. - msco.intListProperty[tooBigIndex] = 12; - if (msco.intListProperty.length != expectedLength) - success = false; - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - - // shouldn't be able to access any index > maxIndex. - var valueAtTBI = msco.intListProperty[tooBigIndex]; - if (valueAtTBI != undefined) - success = false; - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - - // shouldn't be able to set the length to < 0 - msco.intListProperty.length = negativeIndex; - if (msco.intListProperty.length != expectedLength) - success = false; // shouldn't have changed. - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - - // shouldn't be able to set any index < 0. - msco.intListProperty[negativeIndex] = 12; - if (msco.intListProperty.length != expectedLength) - success = false; - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - - // shouldn't be able to access any index < 0. - var valueAtNI = msco.intListProperty[negativeIndex]; - if (valueAtNI != undefined) - success = false; - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - - // NOTE: while these two operations are technically - // fine, we expect std::bad_alloc exceptions here - // which we handle in the sequence wrapper. - msco.intListProperty.length = maxIndex; - if (msco.intListProperty.length != expectedLength) - success = false; - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - msco.intListProperty[maxIndex] = 15; - if (msco.intListProperty.length != expectedLength) - success = false; - if (!verifyExpected(msco.intListProperty, 4)) - success = false; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.read.error.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.read.error.qml deleted file mode 100644 index 12a76d7e7d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.read.error.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - property int pointListLength: 0 - property variant pointList - - function performTest() { - // we have NOT registered QList<QPoint> as a type - pointListLength = msco.pointListProperty.length; - pointList = msco.pointListProperty; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.read.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.read.qml deleted file mode 100644 index 4a8a4a17b2..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.read.qml +++ /dev/null @@ -1,105 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - property int intListLength: 0 - property variant intList - property int qrealListLength: 0 - property variant qrealList - property int boolListLength: 0 - property variant boolList - property int stringListLength: 0 - property variant stringList - property int urlListLength: 0 - property variant urlList - property int qstringListLength: 0 - property variant qstringList - - function readSequences() { - intListLength = msco.intListProperty.length; - intList = msco.intListProperty; - qrealListLength = msco.qrealListProperty.length; - qrealList = msco.qrealListProperty; - boolListLength = msco.boolListProperty.length; - boolList = msco.boolListProperty; - stringListLength = msco.stringListProperty.length; - stringList = msco.stringListProperty; - urlListLength = msco.urlListProperty.length; - urlList = msco.urlListProperty; - qstringListLength = msco.qstringListProperty.length; - qstringList = msco.qstringListProperty; - } - - property int intVal - property real qrealVal - property bool boolVal - property string stringVal - property url urlVal - property string qstringVal - - function readSequenceElements() { - intVal = msco.intListProperty[1]; - qrealVal = msco.qrealListProperty[1]; - boolVal = msco.boolListProperty[1]; - stringVal = msco.stringListProperty[1]; - urlVal = msco.urlListProperty[1]; - qstringVal = msco.qstringListProperty[1]; - } - - property bool enumerationMatches - function enumerateSequenceElements() { - var jsIntList = [1, 2, 3, 4, 5]; - msco.intListProperty = [1, 2, 3, 4, 5]; - - var jsIntListProps = [] - var seqIntListProps = [] - - enumerationMatches = true; - for (var i in jsIntList) { - jsIntListProps.push(i); - if (jsIntList[i] != msco.intListProperty[i]) { - enumerationMatches = false; - } - } - for (var j in msco.intListProperty) { - seqIntListProps.push(j); - if (jsIntList[j] != msco.intListProperty[j]) { - enumerationMatches = false; - } - } - - if (jsIntListProps.length != seqIntListProps.length) { - enumerationMatches = false; - } - - var emptyList = []; - msco.stringListProperty = [] - if (emptyList.toString() != msco.stringListProperty.toString()) { - enumerationMatches = false; - } - if (emptyList.valueOf() != msco.stringListProperty.valueOf()) { - enumerationMatches = false; - } - } - - property bool referenceDeletion: false - function testReferenceDeletion() { - referenceDeletion = true; - var testObj = msco.generateTestObject(); - testObj.intListProperty = [1, 2, 3, 4, 5]; - var testSequence = testObj.intListProperty; - if (testSequence[4] != 5) - referenceDeletion = false; - msco.deleteTestObject(testObj); // delete referenced object. - if (testSequence[4] == 5) - referenceDeletion = false; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.threads.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.threads.qml deleted file mode 100644 index aefad89ca4..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.threads.qml +++ /dev/null @@ -1,74 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - property bool success: false - property bool finished: false - - function testIntSequence() { - msco.intListProperty = [ 0, 1, 2, 3, 4, 5, 6, 7 ]; - worker.sendSequence(msco.intListProperty); - } - - function testQrealSequence() { - msco.qrealListProperty = [ 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1 ]; - worker.sendSequence(msco.qrealListProperty); - } - - function testBoolSequence() { - msco.boolListProperty = [ false, true, true, false, false, true, false, true ]; - worker.sendSequence(msco.boolListProperty); - } - - function testStringSequence() { - msco.stringListProperty = [ "one", "two", "three", "four" ]; - worker.sendSequence(msco.stringListProperty); - } - - function testQStringSequence() { - msco.qstringListProperty = [ "one", "two", "three", "four" ]; - worker.sendSequence(msco.qstringListProperty); - } - - function testUrlSequence() { - msco.urlListProperty = [ "www.example1.com", "www.example2.com", "www.example3.com", "www.example4.com" ]; - worker.sendSequence(msco.urlListProperty); - } - - function testVariantSequence() { - msco.variantListProperty = [ "one", true, 3, "four" ]; - worker.sendSequence(msco.variantListProperty); - } - - WorkerScript { - id: worker - source: "threadScript.js" - - property variant expected - property variant response - - function sendSequence(seq) { - root.success = false; - root.finished = false; - worker.expected = seq; - worker.sendMessage(seq); - } - - onMessage: { - worker.response = messageObject; - if (worker.response.toString() == worker.expected.toString()) - root.success = true; - else - root.success = false; - root.finished = true; - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.write.error.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.write.error.qml deleted file mode 100644 index 75beafd1ee..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.write.error.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - function performTest() { - // we have NOT registered QList<QPoint> as a type - var pointList = [ Qt.point(7,7), Qt.point(8,8), Qt.point(9,9) ]; - msco.pointListProperty = pointList; // error. - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.write.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.write.qml deleted file mode 100644 index 812de043b7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sequenceConversion.write.qml +++ /dev/null @@ -1,109 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - id: root - objectName: "root" - - MySequenceConversionObject { - id: msco - objectName: "msco" - } - - property bool success - - function writeSequences() { - success = true; - - var intList = [ 9, 8, 7, 6 ]; - msco.intListProperty = intList; - var qrealList = [ 9.9, 8.8, 7.7, 6.6 ]; - msco.qrealListProperty = qrealList; - var boolList = [ false, false, false, true ]; - msco.boolListProperty = boolList; - var stringList = [ "nine", "eight", "seven", "six" ] - msco.stringListProperty = stringList; - var urlList = [ "http://www.example9.com", "http://www.example8.com", "http://www.example7.com", "http://www.example6.com" ] - msco.urlListProperty = urlList; - var qstringList = [ "nine", "eight", "seven", "six" ] - msco.qstringListProperty = qstringList; - - if (msco.intListProperty[0] != 9 || msco.intListProperty[1] != 8 || msco.intListProperty[2] != 7 || msco.intListProperty[3] != 6) - success = false; - if (msco.qrealListProperty[0] != 9.9 || msco.qrealListProperty[1] != 8.8 || msco.qrealListProperty[2] != 7.7 || msco.qrealListProperty[3] != 6.6) - success = false; - if (msco.boolListProperty[0] != false || msco.boolListProperty[1] != false || msco.boolListProperty[2] != false || msco.boolListProperty[3] != true) - success = false; - if (msco.stringListProperty[0] != "nine" || msco.stringListProperty[1] != "eight" || msco.stringListProperty[2] != "seven" || msco.stringListProperty[3] != "six") - success = false; - if (msco.urlListProperty[0] != "http://www.example9.com" || msco.urlListProperty[1] != "http://www.example8.com" || msco.urlListProperty[2] != "http://www.example7.com" || msco.urlListProperty[3] != "http://www.example6.com") - success = false; - if (msco.qstringListProperty[0] != "nine" || msco.qstringListProperty[1] != "eight" || msco.qstringListProperty[2] != "seven" || msco.qstringListProperty[3] != "six") - success = false; - } - - function writeSequenceElements() { - // set up initial conditions. - writeSequences(); - success = true; - - // element set. - msco.intListProperty[3] = 2; - msco.qrealListProperty[3] = 2.2; - msco.boolListProperty[3] = false; - msco.stringListProperty[3] = "changed"; - msco.urlListProperty[3] = "http://www.examplechanged.com"; - msco.qstringListProperty[3] = "changed"; - - if (msco.intListProperty[0] != 9 || msco.intListProperty[1] != 8 || msco.intListProperty[2] != 7 || msco.intListProperty[3] != 2) - success = false; - if (msco.qrealListProperty[0] != 9.9 || msco.qrealListProperty[1] != 8.8 || msco.qrealListProperty[2] != 7.7 || msco.qrealListProperty[3] != 2.2) - success = false; - if (msco.boolListProperty[0] != false || msco.boolListProperty[1] != false || msco.boolListProperty[2] != false || msco.boolListProperty[3] != false) - success = false; - if (msco.stringListProperty[0] != "nine" || msco.stringListProperty[1] != "eight" || msco.stringListProperty[2] != "seven" || msco.stringListProperty[3] != "changed") - success = false; - if (msco.urlListProperty[0] != "http://www.example9.com" || msco.urlListProperty[1] != "http://www.example8.com" || msco.urlListProperty[2] != "http://www.example7.com" || msco.urlListProperty[3] != "http://www.examplechanged.com") - success = false; - if (msco.qstringListProperty[0] != "nine" || msco.qstringListProperty[1] != "eight" || msco.qstringListProperty[2] != "seven" || msco.qstringListProperty[3] != "changed") - success = false; - } - - function writeOtherElements() { - success = true; - var jsIntList = [1, 2, 3, 4, 5]; - msco.intListProperty = [1, 2, 3, 4, 5]; - - jsIntList[8] = 8; - msco.intListProperty[8] = 8; - if (jsIntList[8] != msco.intListProperty[8]) - success = false; - if (jsIntList.length != msco.intListProperty.length) - success = false; - - // NOTE: we can't exactly match the spec here -- we fill the sequence with a default (rather than empty) value - if (msco.intListProperty[5] != 0 || msco.intListProperty[6] != 0 || msco.intListProperty[7] != 0) - success = false; - - // should have no effect - var currLength = jsIntList.length; - jsIntList.someThing = 9; - msco.intListProperty.someThing = 9; - if (msco.intListProperty.length != currLength) - success = false; - } - - property bool referenceDeletion: false - function testReferenceDeletion() { - referenceDeletion = true; - var testObj = msco.generateTestObject(); - testObj.intListProperty = [1, 2, 3, 4, 5]; - var testSequence = testObj.intListProperty; - if (testSequence[4] != 5) - referenceDeletion = false; - msco.deleteTestObject(testObj); // delete referenced object. - testSequence[4] = 5; // shouldn't work, since referenced object no longer exists. - if (testSequence[4] == 5) - referenceDeletion = false; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml deleted file mode 100644 index b967f0984c..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml +++ /dev/null @@ -1,16 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - id: root - property bool test1: false - property bool test2: false - - MyQmlObject.value2: 7 - - Component.onCompleted: { - test1 = root.MyQmlObject.value2 == 7; - test2 = root.MyQmlObjectAlias.value2 == 7; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml deleted file mode 100644 index b30aa8b4cd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 - -Item { - property int test: myObject.object.a - - Item { - id: myObject - property QtObject object; - object: QtObject { - property int a: 10 - } - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml deleted file mode 100644 index fbd09142f7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - onBasicSignal: setString('pass') -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml deleted file mode 100644 index 6467c42bb9..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c + ' ' + d + ' ' + e) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.3.qml deleted file mode 100644 index 690b7cf216..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.3.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - onUnnamedArgumentSignal: setString('pass ' + a + ' ' + c) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.4.qml deleted file mode 100644 index 0e1e728a86..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.4.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - - -MyQmlObject { - onSignalWithGlobalName: setString('pass ' + parseInt("5")) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalHandlers.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalHandlers.qml deleted file mode 100644 index 975be1b2ad..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalHandlers.qml +++ /dev/null @@ -1,60 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -QtObject { - id: root - - property int count: 0 - signal testSignal - onTestSignal: count++ - - property int funcCount: 0 - function testFunction() { - funcCount++; - } - - //should increment count - function testSignalCall() { - testSignal() - } - - //should NOT increment count, and should throw an exception - property string errorString - function testSignalHandlerCall() { - try { - onTestSignal() - } catch (error) { - errorString = error.toString(); - } - } - - //should increment funcCount once - function testSignalConnection() { - testSignal.connect(testFunction) - testSignal(); - testSignal.disconnect(testFunction) - testSignal(); - } - - //should increment funcCount once - function testSignalHandlerConnection() { - onTestSignal.connect(testFunction) - testSignal(); - onTestSignal.disconnect(testFunction) - testSignal(); - } - - //should be defined - property bool definedResult: false - function testSignalDefined() { - if (testSignal !== undefined) - definedResult = true; - } - - //should be defined - property bool definedHandlerResult: false - function testSignalHandlerDefined() { - if (onTestSignal !== undefined) - definedHandlerResult = true; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml deleted file mode 100644 index 4fc2dab943..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml +++ /dev/null @@ -1,18 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject -{ - id: root - property int intProperty - property real realProperty - property color colorProperty - property variant variantProperty - property int enumProperty - property int qtEnumProperty - - signal mySignal(int a, real b, color c, variant d, int e, int f) - - onMySignal: { intProperty = a; realProperty = b; colorProperty = c; variantProperty = d; enumProperty = e; qtEnumProperty = f; } - - onBasicSignal: root.mySignal(10, 19.2, Qt.rgba(1, 1, 0, 1), Qt.rgba(1, 0, 1, 1), MyQmlObject.EnumValue3, Qt.LeftButton) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml deleted file mode 100644 index d98d7e9c81..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml +++ /dev/null @@ -1,20 +0,0 @@ -import Qt.test 1.0 -import QtQuick 2.0 - -MyQmlObject { - property real base: 50 - property alias test1: myObject.test1 - property alias test2: myObject.test2 - - objectProperty: QtObject { - id: myObject - property real test1: base - property real test2: Math.max(0, base) - } - - // Signal with no args - onBasicSignal: base = 200 - // Signal with args - onArgumentSignal: base = 400 -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalWithJSValueInVariant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalWithJSValueInVariant.qml deleted file mode 100644 index a6f1aa381a..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalWithJSValueInVariant.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property string expression - property string compare - property bool pass: false - onSignalWithVariant: - { - var expected = eval(expression); - pass = eval(compare)(arg, expected); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalWithQJSValue.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalWithQJSValue.qml deleted file mode 100644 index 36f481d533..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalWithQJSValue.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property string expression - property string compare - property bool pass: false - - onSignalWithQJSValue: - { - qjsvalueMethod(arg); - var expected = eval(expression); - pass = eval(compare)(arg, expected); - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalWithUnknownTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalWithUnknownTypes.qml deleted file mode 100644 index 49293edfb3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalWithUnknownTypes.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - onSignalWithUnknownType: variantMethod(arg); -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml b/tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml deleted file mode 100644 index e709e3a8bd..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool test1: (a === true) - property bool test2: !(a === false) - property bool test3: (b === 11.2) - property bool test4: !(b === 9) - property bool test5: (c === 9) - property bool test6: !(c === 13) - property bool test7: (d === "Hello world") - property bool test8: !(d === "Hi") - - property bool a: true - property real b: 11.2 - property int c: 9 - property string d: "Hello world" -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/stringArg.qml b/tests/auto/declarative/qdeclarativeecmascript/data/stringArg.qml deleted file mode 100644 index 7019af9da5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/stringArg.qml +++ /dev/null @@ -1,49 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - property bool returnValue: false - - property string first - property string second - property string third - property string fourth - property string fifth - property string sixth - property string seventh - property string eighth - property string ninth - - function success() { - var a = "Value is %1"; - for (var ii = 0; ii < 10; ++ii) { - first = a.arg("string"); - second = a.arg(1); - third = a.arg(true); - fourth = a.arg(3.345); - fifth = a.arg(undefined); - sixth = a.arg(null); - seventh = a.arg({"test":5}); - eighth = a.arg({"test":5, "again":6}); - } - - if (first != "Value is string") returnValue = false; - if (second != "Value is 1") returnValue = false; - if (third != "Value is true") returnValue = false; - if (fourth != "Value is 3.345") returnValue = false; - if (fifth != "Value is undefined") returnValue = false; - if (sixth != "Value is null") returnValue = false; - if (seventh != "Value is [Object object]") returnValue = false; - if (eighth != "Value is [Object object]") returnValue = false; - returnValue = true; - } - - function failure() { - returnValue = true; - var a = "Value is %1"; - for (var ii = 0; ii < 10; ++ii) { - ninth = a.arg(1,2,3,4); - } - returnValue = false; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.1.qml deleted file mode 100644 index 3c7870839d..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.1.qml +++ /dev/null @@ -1,33 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - value: { - var value = 0 - switch (stringProperty) { - case "A": - value = value + 1 - value = value + 1 - /* should fall through */ - case "S": - value = value + 1 - value = value + 1 - value = value + 1 - break; - case "D": { // with curly braces - value = value + 1 - value = value + 1 - value = value + 1 - break; - } - case "F": { - value = value + 1 - value = value + 1 - value = value + 1 - } - /* should fall through */ - default: - value = value + 1 - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.2.qml deleted file mode 100644 index 928d36be1f..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.2.qml +++ /dev/null @@ -1,33 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - value: { - var value = 0 - switch (stringProperty) { - case "A": - value = value + 1 - value = value + 1 - /* should fall through */ - case "S": - value = value + 1 - value = value + 1 - value = value + 1 - break; - default: - value = value + 1 - case "D": { // with curly braces - value = value + 1 - value = value + 1 - value = value + 1 - break; - } - case "F": { - value = value + 1 - value = value + 1 - value = value + 1 - } - /* should fall through */ - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.3.qml deleted file mode 100644 index 5b05d88767..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.3.qml +++ /dev/null @@ -1,33 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - value: { - var value = 0 - switch (stringProperty) { - default: - value = value + 1 - case "A": - value = value + 1 - value = value + 1 - /* should fall through */ - case "S": - value = value + 1 - value = value + 1 - value = value + 1 - break; - case "D": { // with curly braces - value = value + 1 - value = value + 1 - value = value + 1 - break; - } - case "F": { - value = value + 1 - value = value + 1 - value = value + 1 - } - /* should fall through */ - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.4.qml deleted file mode 100644 index 43ba199a04..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.4.qml +++ /dev/null @@ -1,31 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - value: { - var value = 0 - switch (stringProperty) { - case "A": - value = value + 1 - value = value + 1 - /* should fall through */ - case "S": - value = value + 1 - value = value + 1 - value = value + 1 - break; - case "D": { // with curly braces - value = value + 1 - value = value + 1 - value = value + 1 - break; - } - case "F": { - value = value + 1 - value = value + 1 - value = value + 1 - } - /* should fall through */ - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.5.qml deleted file mode 100644 index e0fc62e392..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.5.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - value: { - var value = 0 - switch (stringProperty) { - default: - value = value + 1 - } - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.6.qml deleted file mode 100644 index 6fb71eb345..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.6.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - function one(kind) { return 123 } - function two(kind) { return 321 } - - value: switch (stringProperty) { - case "A": case "S": one(stringProperty); break; - case "D": case "F": two(stringProperty); break; - default: 0 - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/threadScript.js b/tests/auto/declarative/qdeclarativeecmascript/data/threadScript.js deleted file mode 100644 index 9f94de1bc1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/threadScript.js +++ /dev/null @@ -1,4 +0,0 @@ -WorkerScript.onMessage = function(msg) { - WorkerScript.sendMessage(msg); -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml deleted file mode 100644 index c44acf4fd1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property variant a: 10 - property int x: 10 - property int test: a.x - - Component.onCompleted: { - a = 11; - a = root; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml deleted file mode 100644 index 451bb51996..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant obj: nested - - property variant obj2 - obj2: NestedTypeTransientErrors { - id: nested - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.1.qml deleted file mode 100644 index 71cc67a941..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.1.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property int defaultValue: 123 - - function go() { - undefinedObject.method() // this call will throw an exception - return 321 - } - - value: try { go() } catch(e) { defaultValue } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.2.qml deleted file mode 100644 index e7fca0bff7..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.2.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property int defaultValue: 123 - - function go() { - return 321 - } - - value: try { go() } catch(e) { defaultValue } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.3.qml deleted file mode 100644 index 04b39f73d5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.3.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property int defaultValue: 123 - - function go() { - undefinedObject.method() // this call will throw an exception - return 321 - } - - value: try { var p = go() } catch(e) { var p = defaultValue } finally { p == 123 } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.4.qml deleted file mode 100644 index 231aaf0683..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.4.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property int defaultValue: 123 - - function go() { - return 321 - } - - value: try { var p = go() } catch(e) { var p = defaultValue } finally { p == 321 } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/typeOf.js b/tests/auto/declarative/qdeclarativeecmascript/data/typeOf.js deleted file mode 100644 index 16a34234c0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/typeOf.js +++ /dev/null @@ -1,25 +0,0 @@ -var test1 = typeof a - -var b = {} -var test2 = typeof b - -var c = 5 -var test3 = typeof c - -var d = "hello world" -var test4 = typeof d - -var e = function() {} -var test5 = typeof e - -var f = null -var test6 = typeof f - -var g = undefined -var test7 = typeof g - -var h = true -var test8 = typeof h - -var i = [] -var test9 = typeof i diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/typeOf.qml b/tests/auto/declarative/qdeclarativeecmascript/data/typeOf.qml deleted file mode 100644 index 28f7debed5..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/typeOf.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.0 -import "typeOf.js" as TypeOf - -QtObject { - property string test1 - property string test2 - property string test3 - property string test4 - property string test5 - property string test6 - property string test7 - property string test8 - property string test9 - - Component.onCompleted: { - test1 = TypeOf.test1 - test2 = TypeOf.test2 - test3 = TypeOf.test3 - test4 = TypeOf.test4 - test5 = TypeOf.test5 - test6 = TypeOf.test6 - test7 = TypeOf.test7 - test8 = TypeOf.test8 - test9 = TypeOf.test9 - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/unaryExpression.qml b/tests/auto/declarative/qdeclarativeecmascript/data/unaryExpression.qml deleted file mode 100644 index 0d40bec710..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/unaryExpression.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -Item { - - Component.onCompleted: -++bar - - property int bar: 0 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml deleted file mode 100644 index e73d38e2ce..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - resettableProperty: 19 - - function doReset() { - resettableProperty = undefined; - } -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml deleted file mode 100644 index eceff60aa1..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property bool setUndefined: false - - resettableProperty: setUndefined?undefined:92 -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/urlListProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/urlListProperty.qml deleted file mode 100644 index eeb0815f09..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/urlListProperty.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -Item { - // single url assignment to url list property - MySequenceConversionObject { - id: msco1 - objectName: "msco1" - } - - // single url binding to url list property - MySequenceConversionObject { - id: msco2 - objectName: "msco2" - urlListProperty: "http://qt-project.org/?get%3cDATA%3e"; - } - - // multiple url assignment to url list property - MySequenceConversionObject { - id: msco3 - objectName: "msco3" - } - - // multiple url binding to url list property - MySequenceConversionObject { - id: msco4 - objectName: "msco4" - urlListProperty: [ - "http://qt-project.org/?get%3cDATA%3e", - "http://qt-project.org/?get%3cDATA%3e" - ]; - } - - Component.onCompleted: { - msco1.urlListProperty = "http://qt-project.org/?get%3cDATA%3e"; - msco3.urlListProperty = [ - "http://qt-project.org/?get%3cDATA%3e", - "http://qt-project.org/?get%3cDATA%3e" - ]; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.1.qml deleted file mode 100644 index 451cb03206..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.1.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - property bool result - urlProperty: stringProperty + "/index.html" - intProperty: if (urlProperty) 123; else 321 - value: urlProperty == stringProperty + "/index.html" - result: urlProperty == urlProperty -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.2.qml deleted file mode 100644 index 0e8bdaec96..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.2.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -MyQmlObject { - property bool result - stringProperty: "http://example.org" - urlProperty: stringProperty + "/?get%3cDATA%3e" - value: urlProperty == stringProperty + "/?get%3cDATA%3e" - result: urlProperty == urlProperty -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/v8bindingException.qml b/tests/auto/declarative/qdeclarativeecmascript/data/v8bindingException.qml deleted file mode 100644 index ff203e23e3..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/v8bindingException.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 - -// This test uses a multi-line string which has \r-terminated -// string fragments. The expression rewriter deliberately doesn't -// handle \r-terminated string fragments (see QTBUG-24064) and thus -// this test ensures that we don't crash when we encounter a -// non-compilable binding such as this one. - -Item { - id: root - - Component { - id: comp - Text { - property var value: "," - text: 'multi
line ' + value + 'str
ings' - } - } - - Component.onCompleted: comp.createObject(root, { "value": undefined }) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/v8functionException.qml b/tests/auto/declarative/qdeclarativeecmascript/data/v8functionException.qml deleted file mode 100644 index 51df1c65d8..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/v8functionException.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 - -// This test uses a multi-line string which has \r-terminated -// string fragments. The expression rewriter deliberately doesn't -// handle \r-terminated string fragments (see QTBUG-24064) and thus -// this test ensures that we don't crash when the client attempts -// to invoke a non-compiled dynamic slot. - -Item { - id: root - - function dynamicSlot() { - var someString = "Hello,
this is a
multiline string"; - } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml b/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml deleted file mode 100644 index 33b4a68c40..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyTypeObject { - rectProperty: Qt.rect(0,0,100,100) - rectFProperty: Qt.rect(0,0.5,100,99.5) -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml b/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml deleted file mode 100644 index 6aa8480365..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool runTest: false - onRunTestChanged: test1 = undefined - - property variant test1: 10 - property variant test2: (runTest == false)?11:undefined -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/withStatement.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/withStatement.1.qml deleted file mode 100644 index 28f0c08451..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/withStatement.1.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - property var other: MyQmlObject { - intProperty: 123 - - function go() { - return intProperty; - } - } - - value: with(other) go() -} - diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/writeAttachedProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/writeAttachedProperty.qml deleted file mode 100644 index 3854b069a0..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/writeAttachedProperty.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import Qt.test 1.0 - -QtObject { - function writeValue2() { MyQmlObject.value2 = 9 } -} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/writeRemovesBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/writeRemovesBinding.qml deleted file mode 100644 index a1ba5df071..0000000000 --- a/tests/auto/declarative/qdeclarativeecmascript/data/writeRemovesBinding.qml +++ /dev/null @@ -1,46 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property bool test: false - - property real data: 9 - property real binding: data - - property alias aliasProperty: root.aliasBinding - property real aliasBinding: data - - Component.onCompleted: { - // Non-aliased properties - if (binding != 9) return; - - data = 11; - if (binding != 11) return; - - binding = 6; - if (binding != 6) return; - - data = 3; - if (binding != 6) return; - - - // Writing through an aliased property - if (aliasProperty != 3) return; - if (aliasBinding != 3) return; - - data = 4; - if (aliasProperty != 4) return; - if (aliasBinding != 4) return; - - aliasProperty = 19; - if (aliasProperty != 19) return; - if (aliasBinding != 19) return; - - data = 5; - if (aliasProperty != 19) return; - if (aliasBinding != 19) return; - - test = true; - } -} |