Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
author: Matthew Vogt <matthew.vogt@nokia.com> 2012-02-16 14:43:03 +1000
committer: Qt by Nokia <qt-info@nokia.com> 2012-02-24 04:51:31 +0100
commit: b855240b782395f94315f43ea3e7e182299fac48 (patch)
tree: bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/declarative/qdeclarativelanguage/data
parent: 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)
492 files changed, 0 insertions, 2231 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
deleted file mode 100644
index 2cb7cbe2e0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    id: root
-    property int value: 1892
-    property alias aliasValue: root.value
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
deleted file mode 100644
index 134e1440b5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    property variant other
-    other: MyTypeObject { id: obj }
-    property alias enumAlias: obj.enumProperty;
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
deleted file mode 100644
index 54b548e049..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    property alias obj : otherObj
-    property variant child
-    child: QtObject {
-        id: otherObj
-        property int myValue: 10
-    }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
deleted file mode 100644
index e09eca2ff3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-Alias3 {}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml
deleted file mode 100644
index 9265ffb1df..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    id: root
-
-    signal sig1
-    signal sig2
-    signal sig3
-    signal sig4
-
-    property alias aliasProperty: root.realProperty
-
-    property int realProperty: 0
-
-    property bool test: false
-
-    Component.onCompleted: {
-        root.realProperty = 10;
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
deleted file mode 100644
index 889450b565..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
deleted file mode 100644
index addc4265a9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml
deleted file mode 100644
index 86210e9072..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
deleted file mode 100644
index f48a77598c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int a
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml
deleted file mode 100644
index a6a8168d8f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    property int a
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/DontDoubleCallClassBeginItem.qml b/tests/auto/declarative/qdeclarativelanguage/data/DontDoubleCallClassBeginItem.qml
deleted file mode 100644
index 1f8eac8a3b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/DontDoubleCallClassBeginItem.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-
-MyParserStatus {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
deleted file mode 100644
index 4667adda14..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int super_a: 10
-    property int super_c: 14
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
deleted file mode 100644
index c2ab70ffd6..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    property variant child
-    child: QtObject { id: obj }
-    property alias objAlias: obj;
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml b/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml
deleted file mode 100644
index 558c836e52..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int áâãäå: 10
-    stringProperty: "Test áâãäå: " + áâãäå
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml b/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml
deleted file mode 100644
index 42dbc69044..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    stringProperty: "Test áâãäå: 30"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml
deleted file mode 100644
index 42513e463f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property InlineAssignmentsOverrideBindingsType2 nested: InlineAssignmentsOverrideBindingsType2 {
-        value: 19 * 33
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml b/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml
deleted file mode 100644
index 4a45535a50..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int value
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml
deleted file mode 100644
index 59df88216e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml
deleted file mode 100644
index 1a23277ff8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    property real x;
-    property real y;
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml
deleted file mode 100644
index e620e26490..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyPropertyValueSource {
-    property int x
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml
deleted file mode 100644
index 61f54c5eb8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyContainer {
-    property int x
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
deleted file mode 100644
index 7d49b0ac98..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property QtObject o1
-    property QtObject o2
-
-    property alias a: object2.a
-
-    o1: QtObject { id: object1 }
-    o2: QtObject { 
-        id: object2 
-        property int a: 1923
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml
deleted file mode 100644
index 887d7fae50..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    Item {
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
deleted file mode 100644
index 06a3212916..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    x: "You can't assign a string to a real!"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
deleted file mode 100644
index 947f14811f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-MyQmlObject {
-    property int a: Math.max(10, 9)
-    property int b: 11 
-    Component.onCompleted: console.log("Completed " + a + " " + b);
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
deleted file mode 100644
index 11fb9d9578..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-MyQmlObject {
-    property int a: Math.max(10, 9)
-    property int b: 11 
-    Component.onDestruction: console.log("Destruction " + a + " " + b);
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/ReadOnlyType.qml b/tests/auto/declarative/qdeclarativelanguage/data/ReadOnlyType.qml
deleted file mode 100644
index 456ac762fc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/ReadOnlyType.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    readonly property int readOnlyProperty: 19
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
deleted file mode 100644
index dbb3f06d32..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    id: root
-    property int value: 10
-    property alias valueAlias: root.value
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.10.qml
deleted file mode 100644
index bf6352e82b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.10.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias valueAlias: root.rectProperty
-
-    rectProperty: "10,11,9x8"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.11.qml
deleted file mode 100644
index fbd50d9dc9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.11.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-
-    property alias aliasProperty: root.rectProperty.x
-    rectProperty: "19,13,100x120"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml
deleted file mode 100644
index 5c922709fe..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    id: root
-    property alias aliasObject: root.qmlobjectProperty
-
-    qmlobjectProperty: MyQmlObject { value : 10 }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
deleted file mode 100644
index 16a6d9d903..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-   property variant other
-   other: Alias { id: myAliasObject }
-
-   property alias value: myAliasObject.aliasValue
-   property alias value2: myAliasObject.value
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
deleted file mode 100644
index bd6a769367..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-Alias2 {
-    enumAlias: MyTypeObject.EnumVal2 
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
deleted file mode 100644
index cee2a88cf7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.0
-import Test 1.0
-
-QtObject {
-    property alias otherAlias: otherObject
-
-    property variant other 
-    other: MyQmlObject {
-        id: otherObject
-        value: 10
-    }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
deleted file mode 100644
index 54d3c320e0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property QtObject o;
-    property alias a: object.a
-    o: NestedAlias { id: object }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
deleted file mode 100644
index 0dc54d6787..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property QtObject object
-    property alias aliasedObject: target.object
-
-    object: QtObject {
-        id: target
-
-        property QtObject object
-        object: QtObject {}
-    }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
deleted file mode 100644
index 3cb280ef47..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-   property variant other
-   other: Alias3 { id: myAliasObject }
-
-   property int value: myAliasObject.obj.myValue
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
deleted file mode 100644
index 01cf9142b2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-   property variant other
-   other: Alias4 { id: myAliasObject }
-
-   property int value: myAliasObject.obj.myValue
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml
deleted file mode 100644
index 60e66921d2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    id: root
-
-    property bool test: false
-    property alias myalias: root.objectName
-    signal go
-    onGo: test = true
-
-    Component.onCompleted: {
-        root.go();
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml
deleted file mode 100644
index 089130d14c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick 2.0
-
-AliasPropertyChangeSignalsType {
-    id: root
-    onAliasPropertyChanged: root.test = true
-
-    function blah() {}
-    property int a
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml
deleted file mode 100644
index 4e11b9174a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    id: root
-
-    property alias aliasProperty: root.realProperty
-    onAliasPropertyChanged: root.test = true
-
-    property int realProperty: 0
-
-    property bool test: false
-
-    Component.onCompleted: {
-        root.realProperty = 10;
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml b/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml
deleted file mode 100644
index 64acbd1576..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyRevisionedLegalOverload
-{
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
deleted file mode 100644
index 28a340128d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    flagProperty: "FlagVal1 | FlagVal3"
-    enumProperty: "EnumVal2"
-    stringProperty: "Hello World!"
-    uintProperty: 10
-    intProperty: -19
-    realProperty: 23.2
-    doubleProperty: -19.7
-    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"
-    vector4Property: "10,1,2.2,2.3"
-    urlProperty: "main.qml?with%3cencoded%3edata"
-
-    objectProperty: MyTypeObject { intProperty: 8 }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
deleted file mode 100644
index 717cd84536..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick 2.0
-import Test 1.0
-
-QtObject {
-    property QtObject myProperty
-    property QtObject myProperty2
-    property QtObject myProperty3
-    property QtObject myProperty4
-    property MyQmlObject myProperty5
-    property MyQmlObject myProperty6
-
-    myProperty: CompositeType {}
-    myProperty2: CompositeType2 {}
-    myProperty3: CompositeType3 {}
-    myProperty4: CompositeType4 {}
-    myProperty5: CompositeType2 {}
-    myProperty6: CompositeType4 {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml
deleted file mode 100644
index 399fcea04d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    onLiteralSignal: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml
deleted file mode 100644
index 89e66c6172..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-// This tests assigning literals to "var" properties.
-// These properties store JavaScript object references.
-
-import QtQuick 2.0
-
-QtObject {
-    property var test1: 1
-    property var test2: 1.7
-    property var test3: "Hello world!"
-    property var test4: "#FF008800"
-    property var test5: "10,10,10x10"
-    property var test6: "10,10"
-    property var test7: "10x10"
-    property var test8: "100,100,100"
-    property var test9: String("#FF008800")
-    property var test10: true
-    property var test11: false
-
-    property variant variantTest1Bound: test1 + 4 // 1 + 4 + 4 = 9
-
-    property var test12: Qt.rgba(0.2, 0.3, 0.4, 0.5)
-    property var test13: Qt.rect(10, 10, 10, 10)
-    property var test14: Qt.point(10, 10)
-    property var test15: Qt.size(10, 10)
-    property var test16: Qt.vector3d(100, 100, 100)
-
-    property var test1Bound: test1 + 6 // 1 + 4 + 6 = 11
-
-    Component.onCompleted: {
-        test1 = test1 + 4;
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
deleted file mode 100644
index f6f9a139dc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property variant test1: 1
-    property variant test2: 1.7
-    property variant test3: "Hello world!"
-    property variant test4: "#FF008800"
-    property variant test5: "10,10,10x10"
-    property variant test6: "10,10"
-    property variant test7: "10x10"
-    property variant test8: "100,100,100"
-    property variant test9: String("#FF008800")
-    property variant test10: true
-    property variant test11: false
-    property variant test12: "100,100,100,100"
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml
deleted file mode 100644
index 789cc66215..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    onBasicSignal: MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
deleted file mode 100644
index 1f731c539c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    property variant a;
-    a: MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml
deleted file mode 100644
index 20bdc559c1..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyContainer {
-    MyComponent { x: 10; y: 11; }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml
deleted file mode 100644
index 2a48df8fcf..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    onBasicSignal: basicSlot()
-    onBasicParameterizedSignal: basicSlotWithArgs(parameter)
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.errors.txt
deleted file mode 100644
index 78aa4713fb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Invalid use of namespace
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml
deleted file mode 100644
index 54fef61ef0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0 as Qt47
-
-Qt47.QtObject {
-    Qt47: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml
deleted file mode 100644
index 60ede525e4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    uintProperty: 4000000000
-    intProperty: -2000000000
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.errors.txt
deleted file mode 100644
index eb1430a715..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Cannot assign a value to a signal (expecting a script to be run)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.qml
deleted file mode 100644
index 6fa1259f39..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    onBasicSignal: "hello world"
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
deleted file mode 100644
index 3637ded26f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import Test 1.0 as Namespace
-import QtQuick 2.0
-
-QtObject {
-    MyQmlObject.value: 10
-    Namespace.MyQmlObject.value2: 13
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml b/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml
deleted file mode 100644
index 5d00144eaf..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    componentProperty : MyTypeObject { realProperty: 9 }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/autoNotifyConnection.qml b/tests/auto/declarative/qdeclarativelanguage/data/autoNotifyConnection.qml
deleted file mode 100644
index 640fb54f99..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/autoNotifyConnection.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    property bool receivedNotify : false
-    onPropertyWithNotifyChanged: { receivedNotify = true; }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt
deleted file mode 100644
index 091aad61fa..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Cannot create empty component specification
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
deleted file mode 100644
index a22772bd89..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-Component {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt
deleted file mode 100644
index 76e7656a62..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:9:id is not unique
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
deleted file mode 100644
index fbe315f771..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    id: myId
-    Component {
-        id: myId
-        QtObject {}
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
deleted file mode 100644
index 450fc163bd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:9:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
deleted file mode 100644
index bac23ef903..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    Component {
-        id: myId
-        id: myId2
-        QtObject {}
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt
deleted file mode 100644
index 2ab18685c8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Invalid component body specification
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
deleted file mode 100644
index d07695477d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    QtObject {}
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt
deleted file mode 100644
index e3c2df755f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Component elements may not contain properties other than id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
deleted file mode 100644
index 9867377bb9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    x: 10
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt
deleted file mode 100644
index 2b1c6ca606..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Invalid component id specification
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
deleted file mode 100644
index 010949a35f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    id: QtObject {}
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.7.errors.txt
deleted file mode 100644
index b144814a70..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Component objects cannot declare new properties.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml
deleted file mode 100644
index b1a31195eb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    property int a
-    QtObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.8.errors.txt
deleted file mode 100644
index 6f2d0d201d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Component objects cannot declare new signals.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml
deleted file mode 100644
index fb7a079d39..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    signal a
-    QtObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.9.errors.txt
deleted file mode 100644
index 92f1456895..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Component objects cannot declare new functions.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml
deleted file mode 100644
index 17824b4ede..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-Component {
-    function a() {}
-    QtObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
deleted file mode 100644
index 232b320fb0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property variant test
-
-    test: ComponentComposite {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml
deleted file mode 100644
index e3b32ca5d8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MySecondNamespacedType {
-    list: [ MyNamespacedType {} ]
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml
deleted file mode 100644
index e1daf3b78f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-
-MyNamespacedType {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
deleted file mode 100644
index 2b8d285348..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    objectName: "Hello" + "World"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml
deleted file mode 100644
index 57241ffc28..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int on
-
-    Component.onCompleted: on = 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt
deleted file mode 100644
index 43a8bb28b3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:19:ListElement: cannot use reserved "id" property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
deleted file mode 100644
index c42173ddfb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-ListModel {
-    ListElement { a: 10 }
-    ListElement { id: foo; a: 12 }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
deleted file mode 100644
index 76a8a4773f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-ListModel {
-    ListElement { a: 10 }
-    ListElement { a: 12 }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml
deleted file mode 100644
index 0263ed20f2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    customType: "10"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
deleted file mode 100644
index 03f5c1ff7e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int a: 10
-    property int b: 10 + a
-    property QtObject c: QtObject {}
-    property list<QtObject> d: [ QtObject {}, QtObject {} ]
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt
deleted file mode 100644
index 32055f6608..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-7:9:Cannot assign a value directly to a grouped property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
deleted file mode 100644
index 66a78eb67f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-MyTypeObject {
-    grouped {
-        script: console.log(1921)
-        QtObject {}
-    }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
deleted file mode 100644
index 31d17fd55f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-MyContainer {
-    QtObject {
-        property int index: 0
-    }
-
-    QtObject {
-        property int index: 1
-    }
-
-    children: [
-        QtObject {
-            property int index: 2
-        }, 
-        QtObject {
-            property int index: 3
-        } 
-    ]
-
-    QtObject {
-        property int index: 4
-    }
-
-    QtObject {
-        property int index: 5
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.errors.txt
deleted file mode 100644
index 3348494a8f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Cannot assign to non-existent property "onDestroyed"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml
deleted file mode 100644
index b5b29148a2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    onDestroyed: print("Hello World!")
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt
deleted file mode 100644
index e9b449d8d9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Type Test/MyRevisionedIllegalOverload 1.0 contains an illegal property "propA".  This is an error in the type's implementation.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml
deleted file mode 100644
index 612bcfe0ea..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyRevisionedIllegalOverload
-{
-}
-
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml b/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml
deleted file mode 100644
index 905ee48e0b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    property QtObject object: DontDoubleCallClassBeginItem {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml
deleted file mode 100644
index fb07b9f659..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    onBasicSignal: console.log(1921)
-    onBasicSignal: console.log(1921)
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt
deleted file mode 100644
index 66241cf1f2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:19:id is not unique
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml
deleted file mode 100644
index a993abdd37..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyContainer {
-    MyQmlObject { id: myID }
-    MyQmlObject { id: myID }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.errors.txt
deleted file mode 100644
index 1f9f9169e9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Duplicate default property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml
deleted file mode 100644
index 3dbd5b0b2e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    default property QtObject a
-    default property QtObject b
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.errors.txt
deleted file mode 100644
index 713d5f6272..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:19:Duplicate property name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml
deleted file mode 100644
index 5d4efeebb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int a
-    property bool a
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt
deleted file mode 100644
index 8226c16a1e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:12:Duplicate signal name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml
deleted file mode 100644
index f084947eaf..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    signal a
-    signal a
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt
deleted file mode 100644
index 028e25c37f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:14:Duplicate method name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml
deleted file mode 100644
index 3691529aa9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    function a() {}
-    function a() {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.errors.txt
deleted file mode 100644
index 015d55b03b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:UnknownType is not a type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml
deleted file mode 100644
index 64ba907415..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property UnknownType a
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
deleted file mode 100644
index 2214bacda0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-MyCustomParserType {
-    propa: a + 10
-    propb: Math.min(a, 10)
-    propc: MyPropertyValueSource {}
-    onPropA: a
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
deleted file mode 100644
index 6f822ba157..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick 2.0 
-import QtQuick 2.0 as Qt47
-
-Qt.QtObject {
-    property Qt47.QtObject objectProperty
-    property list<Qt47.QtObject> objectPropertyList
-
-    objectProperty: QtObject {}
-    objectPropertyList: QtObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
deleted file mode 100644
index 5d072b160a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-import QtQuick 2.0 as Qt47
-
-QtObject {
-    property QtObject objectProperty
-    property QtObject objectProperty2
-    objectProperty2: QtObject {}
-
-    property MyComponent myComponentProperty
-    property MyComponent myComponentProperty2 
-    myComponentProperty2: MyComponent {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
deleted file mode 100644
index cd403b3d46..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-QtObject {
-    default property int intProperty : 10
-    property bool boolProperty: false
-    property double doubleProperty: -10.1
-    property real realProperty: -19.9
-    property string stringProperty: "Hello World!"
-    property color colorProperty: "red"
-    property url urlProperty: "main.qml"
-    property date dateProperty: "1945-09-02"
-    property variant varProperty: "Hello World!"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
deleted file mode 100644
index b86e89b5e7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.0
-
-DynamicPropertiesNestedType {
-    property int a: 13
-    property int b: 12
-
-    super_a: 11
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
deleted file mode 100644
index d80d94be09..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick 2.0
-QtObject {
-    signal signal1
-    function slot1() {}
-    signal signal2
-    function slot2() {}
-
-    property int test: 0
-    function slot3(a) { console.log(1921); test = a; }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt
deleted file mode 100644
index 620db2bbba..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1:1:Expected token `numeric literal'
-1:1:Expected a qualified name id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/empty.qml b/tests/auto/declarative/qdeclarativelanguage/data/empty.qml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/empty.qml
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
deleted file mode 100644
index 8b20434973..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Incorrectly specified signal assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
deleted file mode 100644
index c84fea3fe6..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    onBasicSignal {
-    }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.errors.txt
deleted file mode 100644
index d4e0cc0bc4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Element is not creatable.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml
deleted file mode 100644
index ff083250f0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-Font {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt
deleted file mode 100644
index 364ca6747f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:FailingComponent is not a type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml
deleted file mode 100644
index 74a6acfc49..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyContainer {
-    FailingComponent {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt
deleted file mode 100644
index 30748234bc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml
deleted file mode 100644
index d971eee4d0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    value.something: "hello"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt
deleted file mode 100644
index 49e06cbdf5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot override FINAL property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml
deleted file mode 100644
index a84393af94..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    property int value: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml
deleted file mode 100644
index 558c836e52..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int áâãäå: 10
-    stringProperty: "Test áâãäå: " + áâãäå
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml
deleted file mode 100644
index 74918e2764..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-I18n {
-    áâãäå: 15
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml
deleted file mode 100644
index c0b2f94857..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0 as Áâãäå
-
-Áâãäå.MyTypeObject {
-    stringProperty: "Test áâãäå: 40"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
deleted file mode 100644
index e77cb52074..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    function val() {
-        var áâãäå = 20
-        return "Test áâãäå: " + áâãäå
-    }
-    stringProperty: val()
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml
deleted file mode 100644
index 764c92639a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    stringProperty: "Test áâãäå (5 accented 'a' letters)"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml
deleted file mode 100644
index d7954ef718..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml
+++ /dev/null
@@ -1 +0,0 @@
-I18nTypeÁâãäå { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
deleted file mode 100644
index bf048ea60a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-MyContainer {
-    property variant object : myObjectId
-
-    MyTypeObject {
-        id: "myObjectId"
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importFile.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importFile.errors.txt
deleted file mode 100644
index 3fdac0921e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importFile.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:"MyComponent.qml": no such directory
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importFile.qml b/tests/auto/declarative/qdeclarativelanguage/data/importFile.qml
deleted file mode 100644
index a0d8410ca3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importFile.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import "MyComponent.qml" 1.0
-
-MyComponent { text: "Hello" }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml b/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml
deleted file mode 100644
index 804e76b932..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-import com.Nokia.installedtest 1.0
-
-QtObject {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.1.errors.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.1.errors.txt
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.1.qml
deleted file mode 100644
index eaba98ecd2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.1.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import com.nokia.PureJsModule 1.0
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((FirstAPI.greeting() == "Hello") &&
-                (FirstAPI.major == 1) &&
-                (FirstAPI.minor == 0))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.10.errors.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.10.errors.txt
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.10.qml
deleted file mode 100644
index 578ca47ea5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.10.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import com.nokia.PureJsModule 1.0 as PJM
-import com.nokia.PureJsModule 1.0 as AnotherName
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((PJM.FirstAPI.greeting() == "Hello") &&
-                (PJM.FirstAPI.major == 1) &&
-                (PJM.FirstAPI.minor == 0) &&
-                (AnotherName.FirstAPI.greeting() == "Hello") &&
-                (AnotherName.FirstAPI.major == 1) &&
-                (AnotherName.FirstAPI.minor == 0))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.2.errors.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.2.errors.txt
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.2.qml
deleted file mode 100644
index dd3d65c5dd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.2.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import com.nokia.VersionedOnlyJsModule 9.0
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((SomeAPI.greeting() == "Hey hey hey") &&
-                (SomeAPI.major == 9) &&
-                (SomeAPI.minor == 0))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.3.errors.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.3.errors.txt
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.3.qml
deleted file mode 100644
index f59d445a56..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.3.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import com.nokia.PureJsModule 1.0
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((FirstAPI.greeting() == "Hello") &&
-                (FirstAPI.major == 1) &&
-                (FirstAPI.minor == 0) &&
-                (SecondAPI.greeting() == "Howdy") &&
-                (SecondAPI.major == 1) &&
-                (SecondAPI.minor == 5))
-
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.4.errors.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.4.errors.txt
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.4.qml
deleted file mode 100644
index e7b74bac0a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.4.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import com.nokia.PureJsModule 1.6
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((FirstAPI.greeting() == "Good news, everybody!") &&
-                (FirstAPI.major == 1) &&
-                (FirstAPI.minor == 6) &&
-                (SecondAPI.greeting() == "Howdy") &&
-                (SecondAPI.major == 1) &&
-                (SecondAPI.minor == 5))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.5.errors.txt
deleted file mode 100644
index 10dbc80297..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:module "com.nokia.VersionedOnlyJsModule" is not installed
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.5.qml
deleted file mode 100644
index a9ec20c72b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import com.nokia.VersionedOnlyJsModule 1.0
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.6.errors.txt
deleted file mode 100644
index 41c99702a2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:1:"com.nokia.VersionedOnlyJsModule" is ambiguous.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.6.qml
deleted file mode 100644
index 6c4eb89551..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.6.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import com.nokia.VersionedOnlyJsModule 9.0
-import com.nokia.VersionedOnlyJsModule 9.0
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((SomeAPI.greeting() == "Hey hey hey") &&
-                (SomeAPI.major == 9) &&
-                (SomeAPI.minor == 0))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.7.errors.txt
deleted file mode 100644
index 56bc4c548f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:1:"com.nokia.PureJsModule" is ambiguous.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.7.qml
deleted file mode 100644
index 5523a158bd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.7.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import com.nokia.PureJsModule 1.0
-import com.nokia.PureJsModule 1.6
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((FirstAPI.greeting() == "Hello") &&
-                (FirstAPI.major == 1) &&
-                (FirstAPI.minor == 0))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.errors.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.errors.txt
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.qml
deleted file mode 100644
index 4ddedc31a8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import com.nokia.PureJsModule 1.5 as PJM
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((PJM.FirstAPI.greeting() == "Hello") &&
-                (PJM.FirstAPI.major == 1) &&
-                (PJM.FirstAPI.minor == 0) &&
-                (PJM.SecondAPI.greeting() == "Howdy") &&
-                (PJM.SecondAPI.major == 1) &&
-                (PJM.SecondAPI.minor == 5))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importJs.9.errors.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.9.errors.txt
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.9.qml
deleted file mode 100644
index 351164ba41..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importJs.9.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import com.nokia.PureJsModule 1.5 as PJM_1_5
-import com.nokia.PureJsModule 1.6 as PJM_1_6
-import QtQuick 2.0
-
-Item {
-    property bool test: false
-
-    Component.onCompleted: {
-        test = ((PJM_1_5.FirstAPI.greeting() == "Hello") &&
-                (PJM_1_5.FirstAPI.major == 1) &&
-                (PJM_1_5.FirstAPI.minor == 0) &&
-                (PJM_1_5.SecondAPI.greeting() == "Howdy") &&
-                (PJM_1_5.SecondAPI.major == 1) &&
-                (PJM_1_5.SecondAPI.minor == 5) &&
-                (PJM_1_6.FirstAPI.greeting() == "Good news, everybody!") &&
-                (PJM_1_6.FirstAPI.major == 1) &&
-                (PJM_1_6.FirstAPI.minor == 6))
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt
deleted file mode 100644
index 231998daf7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:1:Namespace Rectangle cannot be used as a type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
deleted file mode 100644
index 45ad40501b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0 as Rectangle
-import QtQuick 2.0
-
-Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNewerVersion.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importNewerVersion.errors.txt
deleted file mode 100644
index 413f096384..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNewerVersion.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:module "Test" version 2.0 is not installed
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNewerVersion.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNewerVersion.qml
deleted file mode 100644
index c4a0d386a4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNewerVersion.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Test 2.0
-
-MyTypeObject { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.errors.txt
deleted file mode 100644
index 1baf05cee0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:1:"will-not-be-found": no such directory
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml
deleted file mode 100644
index 5cbee0264b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-// imports...
-import "will-not-be-found"
-import QtQuick 2.0
-
-Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNonExistOlder.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importNonExistOlder.errors.txt
deleted file mode 100644
index dfa7a369ff..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNonExistOlder.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:module "Test" version 0.1 is not installed
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNonExistOlder.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNonExistOlder.qml
deleted file mode 100644
index 18514b1efa..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNonExistOlder.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Test 0.1
-
-MyTypeObject { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt
deleted file mode 100644
index c7d880e79e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:16:Library import requires a version
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml
deleted file mode 100644
index 23ed566e15..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test as S
-
-S.MyQmlObject {
-    property real x;
-    property real y;
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
deleted file mode 100644
index 89e58ee764..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:35:Library import requires a version
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
deleted file mode 100644
index 97ec22280f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import com.nokia.installedtest as T
-
-T.InstalledTest {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importscript.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importscript.1.errors.txt
deleted file mode 100644
index ebc936d153..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importscript.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:8:Script import requires a qualifier
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importscript.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/importscript.1.qml
deleted file mode 100644
index 2b2ab6ba0d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/importscript.1.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import "test.js"
-
-Item { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.errors.insensitive.txt b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.errors.insensitive.txt
deleted file mode 100644
index 3813680562..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.errors.insensitive.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-3:1:Type IncorrectCaseType unavailable
--1:-1:File name case mismatch
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.errors.sensitive.txt b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.errors.sensitive.txt
deleted file mode 100644
index abed1a73f5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.errors.sensitive.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:IncorrectCaseType is not a type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml
deleted file mode 100644
index 15b6dc3a6e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-IncorrectCaseType {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml
deleted file mode 100644
index addc4265a9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml b/tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml
deleted file mode 100644
index 4390d22d45..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-InlineAssignmentsOverrideBindingsType {
-    property int test: nested.value
-    nested.value: 11
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
deleted file mode 100644
index a6f277adb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-MyContainer {
-    Component {
-        id: myComponent
-        MyQmlObject {
-            value: 11
-        }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/insertedSemicolon.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/insertedSemicolon.1.errors.txt
deleted file mode 100644
index 651009cf05..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/insertedSemicolon.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-9:5:Expected a qualified name id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/insertedSemicolon.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/insertedSemicolon.1.qml
deleted file mode 100644
index 4e561b48b2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/insertedSemicolon.1.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    function foo()
-    {
-        return
-    }
-
-    1223
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
deleted file mode 100644
index f85e3e4e5b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-MyQmlObject {
-    interfaceProperty: MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
deleted file mode 100644
index c87dfae785..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-MyContainer {
-    qlistInterfaces: [ 
-        MyQmlObject {},
-        MyQmlObject {}
-    ]
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.errors.txt
deleted file mode 100644
index 9848e48579..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:No property alias location
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml
deleted file mode 100644
index 8aab61e49e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property alias a
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.10.errors.txt
deleted file mode 100644
index 93652a7042..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias location
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.10.qml
deleted file mode 100644
index 3ff7b16fd8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.10.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: root.rectProperty.blah
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.errors.txt
deleted file mode 100644
index 3e15628a13..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:23:Invalid alias location
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml
deleted file mode 100644
index b85b2584eb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property alias a: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.errors.txt
deleted file mode 100644
index fbf1b580e2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias reference. An alias reference must be specified as <id>, <id>.<property> or <id>.<value property>.<property>
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml
deleted file mode 100644
index a363373734..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: root.rectProperty.x.y
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.4.errors.txt
deleted file mode 100644
index fbf1b580e2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias reference. An alias reference must be specified as <id>, <id>.<property> or <id>.<value property>.<property>
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.4.qml
deleted file mode 100644
index cfdfca0590..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.4.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: print("Hello!")
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.5.errors.txt
deleted file mode 100644
index 6f78e599d4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias reference. Unable to find id "otherroot"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.5.qml
deleted file mode 100644
index 0c1d5d7ef1..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.5.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: otherroot
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.6.errors.txt
deleted file mode 100644
index 93652a7042..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias location
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.6.qml
deleted file mode 100644
index edfdb24bcc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.6.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: root.foobar
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.errors.txt
deleted file mode 100644
index 93652a7042..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias location
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.qml
deleted file mode 100644
index 2a09648d57..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: root.nonScriptable
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.8.errors.txt
deleted file mode 100644
index 93652a7042..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias location
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.8.qml
deleted file mode 100644
index 4faa52d250..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.8.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: root.imaginary.x
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.9.errors.txt
deleted file mode 100644
index 93652a7042..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:23:Invalid alias location
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.9.qml
deleted file mode 100644
index f1839127b0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.9.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    id: root
-    property alias a: root.floatProperty.x
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt
deleted file mode 100644
index 492bbb48fa..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:17:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
deleted file mode 100644
index 20864b9a41..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    MyQmlObject.foo: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt
deleted file mode 100644
index ff2409bd2d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
deleted file mode 100644
index 20906de606..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0 as Namespace
-import QtQuick 2.0
-
-QtObject {
-    Namespace.MadeUpClass.foo: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt
deleted file mode 100644
index fee5050743..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Not an attached property name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
deleted file mode 100644
index 95add15147..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0 as Namespace
-import QtQuick 2.0
-
-QtObject {
-    Namespace.madeUpClass.foo: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.12.errors.txt
deleted file mode 100644
index 189a795837..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.12.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:13:Attached properties cannot be used here
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.12.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.12.qml
deleted file mode 100644
index 7de503e766..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.12.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    grouped.MyQmlObject.value: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.13.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.13.errors.txt
deleted file mode 100644
index 46d7be2ac3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.13.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Attached properties cannot be used here
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.13.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.13.qml
deleted file mode 100644
index 986ab855c5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.13.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    grouped {
-        MyQmlObject.value: 10
-    }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt
deleted file mode 100644
index 34de769e13..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:27:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
deleted file mode 100644
index 050e619ff2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0 as Namespace
-import QtQuick 2.0
-
-QtObject {
-    Namespace.MyQmlObject.foo: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt
deleted file mode 100644
index 05161c4d10..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid attached object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
deleted file mode 100644
index 24b09a53d5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    MyQmlObject: 10
-}
-
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt
deleted file mode 100644
index a208bcfaa7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Invalid attached object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
deleted file mode 100644
index fb38ee9536..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0 as Namespace
-import QtQuick 2.0
-
-QtObject {
-    Namespace.MyQmlObject: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt
deleted file mode 100644
index 05161c4d10..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid attached object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
deleted file mode 100644
index 789e42f7ef..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    MyQmlObject: QtObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt
deleted file mode 100644
index 6770e1f30b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
deleted file mode 100644
index 9060a55d00..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    Test.MyQmlObject: QtObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt
deleted file mode 100644
index 6770e1f30b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
deleted file mode 100644
index 47b6cc37d8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    MyTypeObject.foo: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt
deleted file mode 100644
index ff2409bd2d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
deleted file mode 100644
index 146934f7ac..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0 as Namespace
-import QtQuick 2.0
-
-QtObject {
-    Namespace.MyTypeObject.foo: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt
deleted file mode 100644
index 6770e1f30b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
deleted file mode 100644
index 73724aa6e7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    MadeUpClass.foo: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt
deleted file mode 100644
index 810fd31b41..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
deleted file mode 100644
index fa46b8242a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0 
-
-QtObject {
-    property variant o;
-    o.blah: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.10.errors.txt
deleted file mode 100644
index 1fcb1b65f5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Cannot assign a value directly to a grouped property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.10.qml
deleted file mode 100644
index 41aa3e2923..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.10.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    grouped: "10x10"
-    grouped.value: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt
deleted file mode 100644
index 810fd31b41..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
deleted file mode 100644
index 3e516738d6..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0 
-
-QtObject {
-    property int o;
-    o.blah: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt
deleted file mode 100644
index f6d6f29fbf..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml
deleted file mode 100644
index 0bbfc4f529..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    customType.x: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
deleted file mode 100644
index 69c68716d9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml
deleted file mode 100644
index 134fef9b0a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    foo.x: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt
deleted file mode 100644
index 2c8a970da7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Property assignment expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml
deleted file mode 100644
index 55cefe66b9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.x.foo: 100
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml
deleted file mode 100644
index 9ec33abe7b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.x: 100
-    rectProperty.x: 101
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt
deleted file mode 100644
index 4a7e3830a8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:-1:Cannot set properties on nullGrouped as it is null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml
deleted file mode 100644
index 977539a357..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    nullGrouped.script: console.log(1921)
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.8.errors.txt
deleted file mode 100644
index fa0da21c55..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:19:Property has already been assigned a value
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.8.qml
deleted file mode 100644
index 56fca9b990..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.8.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    pointProperty: "10x10"
-    pointProperty.x: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.9.errors.txt
deleted file mode 100644
index 6d837a7222..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:20:Property has already been assigned a value
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.9.qml
deleted file mode 100644
index 982ab26051..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.9.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    pointProperty.x: 10
-    pointProperty: "10x10"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt
deleted file mode 100644
index 2c6b8bf0f3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-3:9:Invalid empty ID
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml
deleted file mode 100644
index 4fb3b298dd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: ""
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt
deleted file mode 100644
index bb811cfe9d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Invalid use of id property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml
deleted file mode 100644
index 668417286b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id.other: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt
deleted file mode 100644
index c721fe91bf..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml
deleted file mode 100644
index 86010bf792..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: hello
-    id: world
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt
deleted file mode 100644
index c167de382e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:20:Invalid import qualifier ID
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml
deleted file mode 100644
index 5b92a1a0eb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import Test 1.0 as hello
-MyQmlObject {
-    id: hello
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt
deleted file mode 100644
index 7251de118f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:9:IDs cannot start with an uppercase letter
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml
deleted file mode 100644
index 62187d9473..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: StartsWithUpperCase
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.7.errors.txt
deleted file mode 100644
index e4fd1db3f0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:9:ID illegally masks global JavaScript property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.7.qml
deleted file mode 100644
index d4bc539650..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.7.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: gc
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.8.errors.txt
deleted file mode 100644
index b03ec6ccea..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:9:IDs must contain only letters, numbers, and underscores
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.8.qml
deleted file mode 100644
index 1ea615c32e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.8.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: hello.world
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.9.errors.txt
deleted file mode 100644
index c010e79492..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:9:IDs must start with a letter or underscore
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.9.qml
deleted file mode 100644
index 57474b7212..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.9.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: "3hello"
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt
deleted file mode 100644
index c010e79492..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:9:IDs must start with a letter or underscore
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml
deleted file mode 100644
index 04db3eb67c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: 1
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
deleted file mode 100644
index 034e937366..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:23:Invalid import qualifier ID
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
deleted file mode 100644
index 37e7c5d4d0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-import QtQuick 2.0 as qt
-
-QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidOn.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidOn.errors.txt
deleted file mode 100644
index b4210a11fc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidOn.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:"MyQmlObject" cannot operate on "value"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidOn.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidOn.qml
deleted file mode 100644
index d748bf4755..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidOn.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    MyQmlObject on value {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt
deleted file mode 100644
index e9e27c479b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Illegal property name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml
deleted file mode 100644
index f9b322e35c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int parseInt
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.1.errors.txt
deleted file mode 100644
index eff7c0e6c4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:Expected a qualified name id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.1.qml
deleted file mode 100644
index 2c63c08510..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.1.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.errors.txt
deleted file mode 100644
index 4bcc948e92..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:Expected type name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml
deleted file mode 100644
index 427827ca89..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-foo {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.3.errors.txt
deleted file mode 100644
index fdce1abf06..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Expected type name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.3.qml
deleted file mode 100644
index 65e93ed55d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.3.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0 as Foo
-
-Foo.foo {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.4.errors.txt
deleted file mode 100644
index 3b90f573a2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Bar.Item - Bar is not a namespace
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.4.qml
deleted file mode 100644
index ba4c8ae1f7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.4.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0 as Foo
-
-Bar.Item {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.1.errors.txt
deleted file mode 100644
index 4bcc948e92..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:Expected type name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.1.qml
deleted file mode 100644
index 658b72d9f2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.1.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-item {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.2.errors.txt
deleted file mode 100644
index fdce1abf06..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Expected type name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.2.qml
deleted file mode 100644
index 9c83238282..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0 as Foo
-
-Foo.item {
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.3.errors.txt
deleted file mode 100644
index 208df2b84a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Expected type name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.3.qml
deleted file mode 100644
index 2f7027081e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0 as Foo
-
-Foo.Item {
-
-    Foo.item {
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.4.errors.txt
deleted file mode 100644
index 3b90f573a2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Bar.Item - Bar is not a namespace
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.4.qml
deleted file mode 100644
index ba4c8ae1f7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidTypeName.4.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0 as Foo
-
-Bar.Item {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js
deleted file mode 100644
index c7b3c8b6ca..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var major = 1
-var minor = 6
-
-function greeting() { return "Good news, everybody!" }
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js
deleted file mode 100644
index b90033eeb4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var major = 1
-var minor = 0
-
-function greeting() { return "Hello" }
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js
deleted file mode 100644
index b802477cb6..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var major = 1
-var minor = 5
-
-function greeting() { return "Howdy" }
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir
deleted file mode 100644
index 083afb051c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-FirstAPI 1.0 FirstAPI.js
-FirstAPI 1.6 FirstAPI.1.6.js
-SecondAPI 1.5 SecondAPI.js
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js
deleted file mode 100644
index b90033eeb4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var major = 1
-var minor = 0
-
-function greeting() { return "Hello" }
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js
deleted file mode 100644
index b802477cb6..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var major = 1
-var minor = 5
-
-function greeting() { return "Howdy" }
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/qmldir
deleted file mode 100644
index 5c3acebd39..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/PureJsModule/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-FirstAPI 1.0 FirstAPI.js
-SecondAPI 1.5 SecondAPI.js
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js
deleted file mode 100644
index efac613fc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var major = 9
-var minor = 0
-
-function greeting() { return "Hey hey hey" }
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir
deleted file mode 100644
index 5c1b182028..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-SomeAPI 9.0 SomeAPI.js
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
deleted file mode 100644
index 56daa9c09a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0 as Qt47
-Qt47.Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
deleted file mode 100644
index 59df88216e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml
deleted file mode 100644
index 26a5d6bba9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
deleted file mode 100644
index ed1b09e419..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Image {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
deleted file mode 100644
index d15720a154..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
+++ /dev/null
@@ -1,4 +0,0 @@
-Rectangle 1.5 InstalledTest2.qml
-LocalLast 1.0 LocalLast.qml
-InstalledTest 1.4 InstalledTest2.qml
-InstalledTest 1.0 InstalledTest.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
deleted file mode 100644
index 56daa9c09a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0 as Qt47
-Qt47.Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
deleted file mode 100644
index 59df88216e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir
deleted file mode 100644
index b301226099..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-InstalledTest 1.4 InstalledTest2.qml
-InstalledTestTP 0.0 InstalledTest.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.errors.txt
deleted file mode 100644
index 35d2d3510e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:24:Cannot assign object to list
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml
deleted file mode 100644
index 1af190633d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-MyContainer {
-    containerChildren: QtObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt
deleted file mode 100644
index 8b40aa3ebb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-3:15:Cannot assign primitives to lists
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml
deleted file mode 100644
index e3baadb46c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyContainer {
-    children: 2
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt
deleted file mode 100644
index c721fe91bf..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml
deleted file mode 100644
index 00c4c6b543..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyContainer {
-    children: childBinding.expression
-    children: childBinding2.expression
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
deleted file mode 100644
index 74439c66d4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    ListModel {
-        id: fruitModel
-        ListElement {
-            name: "Apple"
-            cost: 2.45
-        }
-        ListElement {
-            name: "Orange"
-            cost: 3.25
-        }
-        ListElement {
-            name: "Banana"
-            cost: 1.95
-        }
-    }
-
-    Component {
-        id: fruitDelegate
-        Item {
-            width: 200; height: 50
-            Text { text: name }
-            Text { text: '$'+cost; anchors.right: parent.right }
-            MouseArea {
-                anchors.fill: parent
-                onClicked: fruitModel.remove(index)
-            }
-        }
-    }
-
-    ListView {
-        model: fruitModel
-        delegate: fruitDelegate
-        anchors.fill: parent
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
deleted file mode 100644
index dcfe37d6fc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property list<QtObject> listProperty
-    property int test: listProperty.length
-
-    listProperty: [ QtObject{}, QtObject {} ]
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.errors.txt
deleted file mode 100644
index 07d05d3d21..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:MyQmlObject is not a type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.qml b/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.qml
deleted file mode 100644
index 717ca76f05..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test.Version 2.0
-
-MyQmlObject {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt
deleted file mode 100644
index 29342dc46e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-8:5:"MyRevisionedClass.prop2" is not available in Test 1.0.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml
deleted file mode 100644
index fbb37705a1..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-// Check that a property in a later revision (prop2) cannot be assigned
-import QtQuick 2.0
-import Test 1.0
-
-MyRevisionedClass
-{
-    prop1: 1
-    prop2: 2
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt
deleted file mode 100644
index 57b5764b08..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:5:"MyRevisionedClass.onSignal2" is not available in Test 1.0.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.qml
deleted file mode 100644
index 8da7a2558f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyRevisionedClass
-{
-    onSignal1: prop1 = 2
-    onSignal2: prop1 = 3
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt
deleted file mode 100644
index 45364a044f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-9:5:"MyRevisionedClass.propD" is not available in Test 1.1.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.qml
deleted file mode 100644
index 195be2116a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.1
-
-MyRevisionedClass
-{
-    propA: 10
-    propB: 10
-    propC: 10
-    // propD is in rev 1 of MyRevisionedClassUnregistered, but not registered in 1.1
-    propD: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt
deleted file mode 100644
index 98d0b9cefb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Method names cannot begin with an upper case letter
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml
deleted file mode 100644
index a888b1aaf4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    function MyMethod() {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt
deleted file mode 100644
index b31b562de1..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:10:Expected token `{'
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml
deleted file mode 100644
index 2f17045869..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml
+++ /dev/null
@@ -1 +0,0 @@
-something: 24
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt
deleted file mode 100644
index f562246288..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Cannot assign to non-existent property "onClicked"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
deleted file mode 100644
index 92aefef8c4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-QtObject {
-    onClicked: console.log("Hello world!")
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt
deleted file mode 100644
index caf7e55ba2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml
deleted file mode 100644
index 9a0fa6a26b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.foo: 9
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.1.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.1.qml
deleted file mode 100644
index 649c49ee3a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.1.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    intProperty: 10
-    intProperty: 11
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.10.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.10.qml
deleted file mode 100644
index bc21db98f8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.10.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int a: 10
-    a: 11
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.11.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.11.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.11.qml
deleted file mode 100644
index 7d03139056..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.11.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.x: 10
-    rectProperty.x: 11
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.2.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.2.qml
deleted file mode 100644
index abcd216744..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    intProperty: 10
-    intProperty: a + 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml
deleted file mode 100644
index 77eaba0b32..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    intProperty: a + 10
-    intProperty: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.4.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.4.qml
deleted file mode 100644
index c16d04fea6..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.4.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    intProperty: 10
-    intProperty: MyTypeObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.5.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.5.qml
deleted file mode 100644
index 2980c5b28c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyContainer {
-    children: MyContainer {}
-    children: MyContainer {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.6.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.6.qml
deleted file mode 100644
index 492c720edc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.6.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyContainer {
-    children: MyContainer {}
-    children: [ MyContainer {}, MyContainer {} ]
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.7.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.7.qml
deleted file mode 100644
index 2a9c1d0de8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.7.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyContainer {
-    children: [ MyContainer {}, MyContainer {} ]
-    children: MyContainer {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.8.errors.txt
deleted file mode 100644
index 450fc163bd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:9:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.8.qml
deleted file mode 100644
index 052437ea18..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.8.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    grouped {
-        value: 10
-        value: 11
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.9.errors.txt
deleted file mode 100644
index e1f7ec5bc2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Property value set multiple times
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.9.qml
deleted file mode 100644
index e2e954f778..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.9.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    grouped.value: 10
-    grouped.value: 11
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml
deleted file mode 100644
index 5e6c2a91c9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-NestedComponentRoot {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt
deleted file mode 100644
index 53e752b641..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-4:5:Type NestedErrorsType unavailable
-4:8:Invalid property assignment: number expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
deleted file mode 100644
index cc1df4d181..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    NestedErrorsType {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/noCreation.errors.txt
deleted file mode 100644
index 23cd3f3504..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Keys is only available via attached properties
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml b/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml
deleted file mode 100644
index 28852f1a0c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-Keys {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.errors.txt
deleted file mode 100644
index cdfa4b2ef2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Cannot assign to non-existent property "nonScriptable"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.qml
deleted file mode 100644
index bd59bc80f9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    nonScriptable: 11
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt
deleted file mode 100644
index 6bfce9a2c9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:15:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml
deleted file mode 100644
index df7406ce98..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Test 1.0
-MyQmlObject { something: 24 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt
deleted file mode 100644
index 4b30056d59..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml
deleted file mode 100644
index 06ccd37905..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    something: 24
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt
deleted file mode 100644
index 4b30056d59..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
deleted file mode 100644
index 5b08608862..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject { 
-    something: 1 + 1 
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt
deleted file mode 100644
index 4b30056d59..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml
deleted file mode 100644
index 65791919ba..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    something: ;
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt
deleted file mode 100644
index c07f2b99a2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Expected a qualified name id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml
deleted file mode 100644
index 37af05731e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    24
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt
deleted file mode 100644
index 89925b74c2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent default property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml
deleted file mode 100644
index 5cd55d0856..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/notAvailable.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/notAvailable.errors.txt
deleted file mode 100644
index af95a53cc7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/notAvailable.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:UnavailableType is unavailable for testing
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/notAvailable.qml b/tests/auto/declarative/qdeclarativelanguage/data/notAvailable.qml
deleted file mode 100644
index 7c3c7ee08d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/notAvailable.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-
-UnavailableType {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt
deleted file mode 100644
index 07a40949cd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:-1:Cannot set properties on obj as it is null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml
deleted file mode 100644
index 4e36779b5c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyDotPropertyObject {
-    obj.value: 1
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt
deleted file mode 100644
index db7d9c0f60..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Unexpected object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml
deleted file mode 100644
index 99247735dd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.x: MyTypeObject {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
deleted file mode 100644
index 89e6777f8a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-MyTypeObject {
-    // We set a and b to ensure that onCompleted is executed after bindings and
-    // constants have been assigned
-    property int a: Math.min(6, 7)
-    Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
-
-    objectProperty: OnCompletedType {
-        qmlobjectProperty: MyQmlObject {
-            id: nestedObject
-            property int b: 10 
-            Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
-        }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
deleted file mode 100644
index 7d6da260b4..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-MyTypeObject {
-    // We set a and b to ensure that onCompleted is executed after bindings and
-    // constants have been assigned
-    property int a: Math.min(6, 7)
-    Component.onDestruction: console.log("Destruction " + a + " " + nestedObject.b)
-
-    objectProperty: OnDestructionType {
-        qmlobjectProperty: MyQmlObject {
-            id: nestedObject
-            property int b: 10 
-            Component.onDestruction: console.log("Destruction " + a + " " + nestedObject.b)
-        }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt
deleted file mode 100644
index 3ae6c4601b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Expected property type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
deleted file mode 100644
index 6b43e6cc89..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property blah a;
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt
deleted file mode 100644
index a18e21a01c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Unexpected property type modifier
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
deleted file mode 100644
index e6aa00e730..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property invalidmodifier<int> a;
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt
deleted file mode 100644
index 5e09a25b57..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Invalid property type modifier
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
deleted file mode 100644
index 978c1aa80b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property invalidmodifier<QtObject> a;
-}
-
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt
deleted file mode 100644
index b447186849..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:1:Syntax error
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
deleted file mode 100644
index bb94e84244..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    readonly property int a
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.6.errors.txt
deleted file mode 100644
index 985c083cc3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Property names cannot begin with an upper case letter
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml
deleted file mode 100644
index 88f493f9a9..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int Hello
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.7.errors.txt
deleted file mode 100644
index 985c083cc3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Property names cannot begin with an upper case letter
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml
deleted file mode 100644
index 05eb319947..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int Hello: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml
deleted file mode 100644
index 7d6fea24db..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int test: { var _ = 1; _ }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml
deleted file mode 100644
index fa690ba6bc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int test: if (b == 1) 123; else 321;
-    property int b: 1
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
deleted file mode 100644
index e48526abec..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    MyCompositeValueSource on intProperty {}
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml
deleted file mode 100644
index 22aa68250e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    MyPropertyValueSource on intProperty {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
deleted file mode 100644
index 55c507f67e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-QtObject {
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
deleted file mode 100644
index db8a3da2b2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-QtObject {
-    MyQmlObject.value: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/LocalInternal.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/LocalInternal.qml
deleted file mode 100644
index 4ce04c46d2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/LocalInternal.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import QtQuick 2.0
-
-Image { source: "pics/blue.png" }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/Test.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/Test.qml
deleted file mode 100644
index f789a905f2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/Test.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestLocal.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestLocal.qml
deleted file mode 100644
index 11443ca6d5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestLocal.qml
+++ /dev/null
@@ -1 +0,0 @@
-LocalInternal {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestNamed.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestNamed.qml
deleted file mode 100644
index 672cb8f201..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestNamed.qml
+++ /dev/null
@@ -1 +0,0 @@
-NamedLocal { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestSubDir.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestSubDir.qml
deleted file mode 100644
index 0dfede4093..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/TestSubDir.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import "subdir"
-SubTest { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/UndeclaredLocal.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/UndeclaredLocal.qml
deleted file mode 100644
index 4ce04c46d2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/UndeclaredLocal.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import QtQuick 2.0
-
-Image { source: "pics/blue.png" }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/WrongTestLocal.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/WrongTestLocal.qml
deleted file mode 100644
index 8dcb7be231..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/WrongTestLocal.qml
+++ /dev/null
@@ -1 +0,0 @@
-UndeclaredInternal {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/noqmldir/Test.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/noqmldir/Test.qml
deleted file mode 100644
index f789a905f2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/noqmldir/Test.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/pics/blue.png b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/pics/blue.png
deleted file mode 100644
index 46f815f1ed..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/pics/blue.png
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/qmldir
deleted file mode 100644
index 60150f837c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/qmldir
+++ /dev/null
@@ -1,5 +0,0 @@
-Test Test.qml
-TestSubDir TestSubDir.qml
-TestLocal TestLocal.qml
-NamedLocal LocalInternal.qml
-internal LocalInternal LocalInternal.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/subdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/subdir/SubTest.qml
deleted file mode 100644
index 1480ae8683..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/subdir/SubTest.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import QtQuick 2.0
-
-Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/subdir/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/subdir/qmldir
deleted file mode 100644
index a54f7dfa61..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qtest/declarative/qmllanguage/subdir/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-SubTest SubTest.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt
deleted file mode 100644
index b8c34042be..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:21:Invalid property assignment: "readOnlyString" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml
deleted file mode 100644
index 60757bd005..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    readOnlyString: "Hello World"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt
deleted file mode 100644
index d857a0440e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Invalid property assignment: "readOnlyString" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml
deleted file mode 100644
index 8f1633cc11..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    readOnlyString: "Hello" + "World"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt
deleted file mode 100644
index c7e9e1bb2f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:36:Invalid property assignment: "objAlias" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
deleted file mode 100644
index e3c56b701a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-
-QtObject {
-    property variant child
-    child: HelperAlias { objAlias: QtObject {} }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.4.errors.txt
deleted file mode 100644
index d857a0440e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Invalid property assignment: "readOnlyString" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.4.qml
deleted file mode 100644
index 5338ac77bc..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.4.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    MyPropertyValueSource on readOnlyString {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.5.errors.txt
deleted file mode 100644
index e71ae4447c..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:23:Invalid property assignment: "readOnlyProperty" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.5.qml
deleted file mode 100644
index d80b27a1e3..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.5.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-ReadOnlyType {
-    readOnlyProperty: 13
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readonly.qml b/tests/auto/declarative/qdeclarativelanguage/data/readonly.qml
deleted file mode 100644
index 493a9ad502..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/readonly.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    property int testData: 9
-    property alias testData2: myObject.test1
-
-    readonly property int test1: 10
-    readonly property int test2: testData + 9
-    readonly property alias test3: myObject.test1
-
-
-    property variant dummy: MyQmlObject {
-        id: myObject
-        property int test1: 13
-    }
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/registrationOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/registrationOrder.qml
deleted file mode 100644
index 14217ad521..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/registrationOrder.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test.VersionOrder 2.0
-
-MyQmlObject {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml b/tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml
deleted file mode 100644
index 5f237d39a2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import QtQuick 2.0
-Text {
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml
deleted file mode 100644
index 823439acdd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick 2.0
-import Test 1.1
-
-MyRevisionedClass
-{
-    prop1: 1
-    prop2: 10
-
-    onSignal2: prop2 = 3
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml
deleted file mode 100644
index 78ab51a4b7..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import QtQuick 2.0
-import Test 1.1
-
-MyRevisionedSubclass
-{
-    propA: 10
-    propB: 10
-    propC: 10
-    // propD is not registered in 1.1
-    prop1: 10
-    prop2: 10
-    prop3: 10
-    prop4: 10
-
-    onSignal4: prop4 = 2
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
deleted file mode 100644
index d00758387e..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 2.0
-import Test 1.1
-
-MyRevisionedSubclass
-{
-    prop1: 10
-    prop2: 10
-    prop3: 10
-    prop4: 10
-
-    onSignal4: prop4 = 2
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml
deleted file mode 100644
index 8d72cd3844..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyContainerComponent {
-    x: 11
-    MyQmlObject {}
-    MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.1.errors.txt
deleted file mode 100644
index 14463e0941..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:21:Invalid property assignment: script expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.1.qml
deleted file mode 100644
index f07d2231fe..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    scriptProperty: MyTypeObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.2.errors.txt
deleted file mode 100644
index f8a776f9a0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:40:Cannot assign multiple values to a script property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.2.qml
deleted file mode 100644
index dc825c7511..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    scriptProperty: [ MyTypeObject {}, MyTypeObject {} ]
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml
deleted file mode 100644
index 40a3bbeede..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    scriptProperty: foo + bar
-    grouped.script: console.log(1921)
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString2.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString2.qml
deleted file mode 100644
index c42da2b9e1..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    scriptProperty: "hello\n\"world\""
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString3.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString3.qml
deleted file mode 100644
index 0cd82ff58f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString3.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    scriptProperty: 12.345
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString4.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString4.qml
deleted file mode 100644
index 3e2f9a49f1..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/scriptString4.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    scriptProperty: true
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt
deleted file mode 100644
index 78d996016a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:12:Expected parameter type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
deleted file mode 100644
index 1c27baa4e8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    signal mySignal(nontype a)
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt
deleted file mode 100644
index 0d4c33d750..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:21:Unexpected token `,'
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
deleted file mode 100644
index 2b00ab80bb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    signal mySignal(,)
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt
deleted file mode 100644
index bf043ac85a..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:22:Expected token `identifier'
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
deleted file mode 100644
index 1bfcfff7b5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    signal mySignal(a)
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt
deleted file mode 100644
index 513ff60ae6..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:12:Signal names cannot begin with an upper case letter
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml
deleted file mode 100644
index 653c14e6aa..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    signal MySignal
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml
deleted file mode 100644
index 2fcd1a5a4f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    id: me
-    property int v1: 10
-    property int v2: 11
-
-    property int value1
-    property int value2
-    property int value3
-    property int value4
-
-    value1: v1
-    value2: me.v1
-    value3: v1 + v2
-    value4: Math.min(v1, v2)
-
-    objectProperty: me
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml
deleted file mode 100644
index c3a795f536..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyContainer {
-    MyQmlObject {}
-    MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml
deleted file mode 100644
index 30c78237de..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Test 1.0
-MyQmlObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.errors.txt
deleted file mode 100644
index beae562ff0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:10:Cannot assign multiple values to a singular property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml
deleted file mode 100644
index e2760cb418..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property QtObject a
-    a: [ QtObject {}, QtObject {} ]
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.errors.txt
deleted file mode 100644
index beae562ff0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:10:Cannot assign multiple values to a singular property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml
deleted file mode 100644
index ccbc6f0849..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property variant a
-    a: [ QtObject {}, QtObject {} ]
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
deleted file mode 100644
index f789a905f2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
deleted file mode 100644
index f789a905f2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick 2.0
-Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/test.js b/tests/auto/declarative/qdeclarativelanguage/data/test.js
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/test.js
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/test2.js b/tests/auto/declarative/qdeclarativelanguage/data/test2.js
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/test2.js
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt
deleted file mode 100644
index 10e5fb2d96..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:1:UnregisteredObjectType is not a type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml
deleted file mode 100644
index 4969f62ad5..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Test 1.0
-UnregisteredObjectType {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt
deleted file mode 100644
index 3cd626de86..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:13:Invalid property assignment: unsupported type "QMatrix"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml
deleted file mode 100644
index 9f19680368..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    matrix: "1,0,0,0,1,0,0,0,1"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml
deleted file mode 100644
index bf325a74ee..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    rectProperty.x: 10
-    rectProperty.y: 11
-    rectProperty.width: rectProperty.x + 2
-    rectProperty.height: 13
-
-    intProperty: rectProperty.x
-
-    onAction: { var a = rectProperty; a.x = 12; }
-
-    rectProperty2: rectProperty
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml b/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml
deleted file mode 100644
index 169b245450..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property int notifyCount: 0
-
-    property variant foo
-    onFooChanged: notifyCount++
-
-    Component.onCompleted: {
-        foo = 1;
-        foo = 1;
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml b/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml
deleted file mode 100644
index 3e8bca0368..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-import Test 1.1
-
-MySubclass
-{
-    prop1: 10
-    prop2: 10
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt
deleted file mode 100644
index ba7a0766b2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:12:Invalid property assignment: int expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml
deleted file mode 100644
index 289d37f050..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    value: "hello"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt
deleted file mode 100644
index ae75b5289d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:23:Invalid property assignment: datetime expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml
deleted file mode 100644
index 2cf0e50277..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    dateTimeProperty: 12
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt
deleted file mode 100644
index 23a4cda4c2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:20:Invalid property assignment: point expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml
deleted file mode 100644
index ae77ba1fe8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    pointProperty: "apples"
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt
deleted file mode 100644
index 3092100280..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: size expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml
deleted file mode 100644
index b7a366f567..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    sizeProperty: "red"
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt
deleted file mode 100644
index ba7a0766b2..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:12:Invalid property assignment: int expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml
deleted file mode 100644
index 477aff1dbe..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    value: "12"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt
deleted file mode 100644
index d621fdd6cd..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:21:Invalid property assignment: string expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml
deleted file mode 100644
index 672d693c72..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    stringProperty: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt
deleted file mode 100644
index 44768e30cb..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:18:Invalid property assignment: url expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml
deleted file mode 100644
index 633a5ba2ba..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    urlProperty: 12
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.errors.txt
deleted file mode 100644
index 77cf210918..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:24:Cannot assign object to property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml
deleted file mode 100644
index 973fdada24..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import QtQuick 2.0
-MyQmlObject {
-    qmlobjectProperty: QtObject {}
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.17.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.17.errors.txt
deleted file mode 100644
index ef34d0ea95..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.17.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: unknown enumeration
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.17.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.17.qml
deleted file mode 100644
index f678fb3136..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.17.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    enumProperty: 6
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt
deleted file mode 100644
index 9ff9f250c0..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:14:Invalid property assignment: boolean expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml
deleted file mode 100644
index 34b74f7e01..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    enabled: 5
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt
deleted file mode 100644
index 6d971c6499..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:11:Invalid property assignment: rect expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml
deleted file mode 100644
index 384181a17f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    rect: "5,5x10"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt
deleted file mode 100644
index ef34d0ea95..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: unknown enumeration
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml
deleted file mode 100644
index 0787bf5fda..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    enumProperty: "InvalidEnumName"
-}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt
deleted file mode 100644
index cab10bddb8..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: unsigned int expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml
deleted file mode 100644
index c50ae9a26d..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    uintProperty: -13
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt
deleted file mode 100644
index d2b8c54c5b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: number expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml
deleted file mode 100644
index da10b7895f..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    realProperty: "Hello"
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt
deleted file mode 100644
index 614346bd2b..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:20:Invalid property assignment: color expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml
deleted file mode 100644
index ddc3835199..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    colorProperty: 12
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt
deleted file mode 100644
index 1773c00825..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: date expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml
deleted file mode 100644
index a5f6756399..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    dateProperty: 12
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt
deleted file mode 100644
index 8630975c57..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: time expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml
deleted file mode 100644
index a3db732692..0000000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    timeProperty: 12
-}
-
author	Matthew Vogt <matthew.vogt@nokia.com>	2012-02-16 14:43:03 +1000
committer	Qt by Nokia <qt-info@nokia.com>	2012-02-24 04:51:31 +0100
commit	b855240b782395f94315f43ea3e7e182299fac48 (patch)
tree	bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/declarative/qdeclarativelanguage/data
parent	6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)