Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

146 files changed, 95 insertions, 119 deletions

diff --git a/tests/auto/declarative/qmlbindengine/bindingLoop.txt b/tests/auto/declarative/qmlbindengine/data/bindingLoop.qml
index 8b22dd1..8b22dd1 100644
--- a/tests/auto/declarative/qmlbindengine/bindingLoop.txt
+++ b/tests/auto/declarative/qmlbindengine/data/bindingLoop.qml
diff --git a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.qml
index 3147f63..3147f63 100644
--- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.qml
index c89bb49..c89bb49 100644
--- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt
+++ b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.qml
diff --git a/tests/auto/declarative/qmlbindengine/deferredProperties.txt b/tests/auto/declarative/qmlbindengine/data/deferredProperties.qml
index 9dabafe..9dabafe 100644
--- a/tests/auto/declarative/qmlbindengine/deferredProperties.txt
+++ b/tests/auto/declarative/qmlbindengine/data/deferredProperties.qml
diff --git a/tests/auto/declarative/qmlbindengine/enums.1.qml b/tests/auto/declarative/qmlbindengine/data/enums.1.qml
index 6351823..6351823 100644
--- a/tests/auto/declarative/qmlbindengine/enums.1.qml
+++ b/tests/auto/declarative/qmlbindengine/data/enums.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/extensionObjects.txt b/tests/auto/declarative/qmlbindengine/data/extensionObjects.qml
index a902312..a902312 100644
--- a/tests/auto/declarative/qmlbindengine/extensionObjects.txt
+++ b/tests/auto/declarative/qmlbindengine/data/extensionObjects.qml
diff --git a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.qml
index ccb3a22..ccb3a22 100644
--- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.qml
index 6c1fca6..6c1fca6 100644
--- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt
+++ b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.qml
diff --git a/tests/auto/declarative/qmlbindengine/methods.1.txt b/tests/auto/declarative/qmlbindengine/data/methods.1.qml
index 8ba300f..8ba300f 100644
--- a/tests/auto/declarative/qmlbindengine/methods.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/methods.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/methods.2.txt b/tests/auto/declarative/qmlbindengine/data/methods.2.qml
index 70911f7..70911f7 100644
--- a/tests/auto/declarative/qmlbindengine/methods.2.txt
+++ b/tests/auto/declarative/qmlbindengine/data/methods.2.qml
diff --git a/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt b/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.qml
index fbd0914..fbd0914 100644
--- a/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt
+++ b/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt b/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.qml
index 8addcb9..8addcb9 100644
--- a/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt
+++ b/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.qml
diff --git a/tests/auto/declarative/qmlengine/functions.qml b/tests/auto/declarative/qmlbindengine/data/valueTypeFunctions.qml
index 28e8ed4..33b4a68 100644
--- a/tests/auto/declarative/qmlengine/functions.qml
+++ b/tests/auto/declarative/qmlbindengine/data/valueTypeFunctions.qml
@@ -1,4 +1,4 @@
-import Test 1.0
+import Qt.test 1.0
 
 MyTypeObject {
     rectProperty: Qt.rect(0,0,100,100)
diff --git a/tests/auto/declarative/qmlbindengine/testtypes.cpp b/tests/auto/declarative/qmlbindengine/testtypes.cpp
index 3ff05d7..22e3071 100644
--- a/tests/auto/declarative/qmlbindengine/testtypes.cpp
+++ b/tests/auto/declarative/qmlbindengine/testtypes.cpp
@@ -37,5 +37,6 @@ QML_DEFINE_TYPE(Qt.test, 1, 0, 0, MyDeferredObject,MyDeferredObject);
 QML_DEFINE_TYPE(Qt.test, 1, 0, 0, MyQmlContainer,MyQmlContainer);
 QML_DEFINE_EXTENDED_TYPE(Qt.test, 1, 0, 0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
 QML_DEFINE_EXTENDED_TYPE(Qt.test, 1, 0, 0, MyExtendedObject,MyExtendedObject,ExtensionObject);
+QML_DEFINE_TYPE(Qt.test, 1, 0, 0, MyTypeObject, MyTypeObject);
 
 #include "testtypes.moc"
diff --git a/tests/auto/declarative/qmlbindengine/testtypes.h b/tests/auto/declarative/qmlbindengine/testtypes.h
index f27c0b0..f0302aa 100644
--- a/tests/auto/declarative/qmlbindengine/testtypes.h
+++ b/tests/auto/declarative/qmlbindengine/testtypes.h
@@ -4,6 +4,9 @@
 #include <QtCore/qobject.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlexpression.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qsize.h>
+#include <QtCore/qrect.h>
 
 class MyQmlAttachedObject : public QObject
 {
@@ -197,5 +200,69 @@ private:
 };
 QML_DECLARE_TYPE(MyExtendedObject);
 
+class MyTypeObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QPoint pointProperty READ pointProperty WRITE setPointProperty);
+    Q_PROPERTY(QPointF pointFProperty READ pointFProperty WRITE setPointFProperty);
+    Q_PROPERTY(QSize sizeProperty READ sizeProperty WRITE setSizeProperty);
+    Q_PROPERTY(QSizeF sizeFProperty READ sizeFProperty WRITE setSizeFProperty);
+    Q_PROPERTY(QRect rectProperty READ rectProperty WRITE setRectProperty NOTIFY rectPropertyChanged);
+    Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty);
+    
+public:
+    MyTypeObject() {}
+
+    QPoint pointPropertyValue;
+    QPoint pointProperty() const {
+       return pointPropertyValue;
+    }
+    void setPointProperty(const QPoint &v) {
+        pointPropertyValue = v;
+    }
+
+    QPointF pointFPropertyValue;
+    QPointF pointFProperty() const {
+       return pointFPropertyValue;
+    }
+    void setPointFProperty(const QPointF &v) {
+        pointFPropertyValue = v;
+    }
+
+    QSize sizePropertyValue;
+    QSize sizeProperty() const {
+       return sizePropertyValue;
+    }
+    void setSizeProperty(const QSize &v) {
+        sizePropertyValue = v;
+    }
+
+    QSizeF sizeFPropertyValue;
+    QSizeF sizeFProperty() const {
+       return sizeFPropertyValue;
+    }
+    void setSizeFProperty(const QSizeF &v) {
+        sizeFPropertyValue = v;
+    }
+
+    QRect rectPropertyValue;
+    QRect rectProperty() const {
+       return rectPropertyValue;
+    }
+    void setRectProperty(const QRect &v) {
+        rectPropertyValue = v;
+    }
+
+    QRectF rectFPropertyValue;
+    QRectF rectFProperty() const {
+       return rectFPropertyValue;
+    }
+    void setRectFProperty(const QRectF &v) {
+        rectFPropertyValue = v;
+    }
+
+};
+QML_DECLARE_TYPE(MyTypeObject);
+
 #endif // TESTTYPES_H
 
diff --git a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
index 80373fe..612220a 100644
--- a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
+++ b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
@@ -11,7 +11,7 @@
 inline QUrl TEST_FILE(const QString &filename)
 {
     QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename));
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
 }
 
 inline QUrl TEST_FILE(const char *filename)
@@ -39,6 +39,7 @@ private slots:
     void deferredProperties();
     void extensionObjects();
     void enums();
+    void valueTypeFunctions();
 
 private:
     QmlEngine engine;
@@ -47,7 +48,7 @@ private:
 void tst_qmlbindengine::idShortcutInvalidates()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.txt"));
+        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QVERIFY(object->objectProperty() != 0);
@@ -56,7 +57,7 @@ void tst_qmlbindengine::idShortcutInvalidates()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.txt"));
+        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QVERIFY(object->objectProperty() != 0);
@@ -68,13 +69,13 @@ void tst_qmlbindengine::idShortcutInvalidates()
 void tst_qmlbindengine::boolPropertiesEvaluateAsBool()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.txt"));
+        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->stringProperty(), QLatin1String("pass"));
     }
     {
-        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.txt"));
+        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->stringProperty(), QLatin1String("pass"));
@@ -84,7 +85,7 @@ void tst_qmlbindengine::boolPropertiesEvaluateAsBool()
 void tst_qmlbindengine::signalAssignment()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("signalAssignment.1.txt"));
+        QmlComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->string(), QString());
@@ -93,7 +94,7 @@ void tst_qmlbindengine::signalAssignment()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("signalAssignment.2.txt"));
+        QmlComponent component(&engine, TEST_FILE("signalAssignment.2.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->string(), QString());
@@ -105,7 +106,7 @@ void tst_qmlbindengine::signalAssignment()
 void tst_qmlbindengine::methods()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("methods.1.txt"));
+        QmlComponent component(&engine, TEST_FILE("methods.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->methodCalled(), false);
@@ -116,7 +117,7 @@ void tst_qmlbindengine::methods()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("methods.2.txt"));
+        QmlComponent component(&engine, TEST_FILE("methods.2.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->methodCalled(), false);
@@ -129,7 +130,7 @@ void tst_qmlbindengine::methods()
 
 void tst_qmlbindengine::bindingLoop()
 {
-    QmlComponent component(&engine, TEST_FILE("bindingLoop.txt"));
+    QmlComponent component(&engine, TEST_FILE("bindingLoop.qml"));
     QTest::ignoreMessage(QtWarningMsg, "QML MyQmlObject (unknown location): Binding loop detected for property \"stringProperty\" ");
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -337,7 +338,7 @@ void tst_qmlbindengine::objectPropertiesTriggerReeval()
 
 void tst_qmlbindengine::deferredProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("deferredProperties.txt"));
+    QmlComponent component(&engine, TEST_FILE("deferredProperties.qml"));
     MyDeferredObject *object = 
         qobject_cast<MyDeferredObject *>(component.create());
     QVERIFY(object != 0);
@@ -354,7 +355,7 @@ void tst_qmlbindengine::deferredProperties()
 
 void tst_qmlbindengine::extensionObjects()
 {
-    QmlComponent component(&engine, TEST_FILE("extensionObjects.txt"));
+    QmlComponent component(&engine, TEST_FILE("extensionObjects.qml"));
     MyExtendedObject *object = 
         qobject_cast<MyExtendedObject *>(component.create());
     QVERIFY(object != 0);
@@ -385,6 +386,16 @@ void tst_qmlbindengine::enums()
     QCOMPARE(object->property("j").toInt(), 19);
 }
 
+void tst_qmlbindengine::valueTypeFunctions()
+{
+    QmlComponent component(&engine, TEST_FILE("valueTypeFunctions.qml"));
+    MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->rectProperty(), QRect(0,0,100,100));
+    QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5));
+}
+
+
 QTEST_MAIN(tst_qmlbindengine)
 
 #include "tst_qmlbindengine.moc"
diff --git a/tests/auto/declarative/qmlengine/qmlengine.pro b/tests/auto/declarative/qmlengine/qmlengine.pro
deleted file mode 100644
index 4ac81e9..0000000
--- a/tests/auto/declarative/qmlengine/qmlengine.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlengine.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp b/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
deleted file mode 100644
index 8c050cb..0000000
--- a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include <qtest.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/QmlComponent>
-#include <QtDeclarative/QmlEngine>
-
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QUrl>
-
-class tst_qmlengine : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlengine() {}
-
-private slots:
-    void valueTypeFunctions();
-
-private:
-    QmlEngine engine;
-};
-
-class MyTypeObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QPoint pointProperty READ pointProperty WRITE setPointProperty);
-    Q_PROPERTY(QPointF pointFProperty READ pointFProperty WRITE setPointFProperty);
-    Q_PROPERTY(QSize sizeProperty READ sizeProperty WRITE setSizeProperty);
-    Q_PROPERTY(QSizeF sizeFProperty READ sizeFProperty WRITE setSizeFProperty);
-    Q_PROPERTY(QRect rectProperty READ rectProperty WRITE setRectProperty NOTIFY rectPropertyChanged);
-    Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty);
-    
-public:
-    MyTypeObject() {}
-
-    QPoint pointPropertyValue;
-    QPoint pointProperty() const {
-       return pointPropertyValue;
-    }
-    void setPointProperty(const QPoint &v) {
-        pointPropertyValue = v;
-    }
-
-    QPointF pointFPropertyValue;
-    QPointF pointFProperty() const {
-       return pointFPropertyValue;
-    }
-    void setPointFProperty(const QPointF &v) {
-        pointFPropertyValue = v;
-    }
-
-    QSize sizePropertyValue;
-    QSize sizeProperty() const {
-       return sizePropertyValue;
-    }
-    void setSizeProperty(const QSize &v) {
-        sizePropertyValue = v;
-    }
-
-    QSizeF sizeFPropertyValue;
-    QSizeF sizeFProperty() const {
-       return sizeFPropertyValue;
-    }
-    void setSizeFProperty(const QSizeF &v) {
-        sizeFPropertyValue = v;
-    }
-
-    QRect rectPropertyValue;
-    QRect rectProperty() const {
-       return rectPropertyValue;
-    }
-    void setRectProperty(const QRect &v) {
-        rectPropertyValue = v;
-    }
-
-    QRectF rectFPropertyValue;
-    QRectF rectFProperty() const {
-       return rectFPropertyValue;
-    }
-    void setRectFProperty(const QRectF &v) {
-        rectFPropertyValue = v;
-    }
-
-};
-QML_DECLARE_TYPE(MyTypeObject);
-QML_DEFINE_TYPE(Test, 1, 0, 0, MyTypeObject, MyTypeObject);
-
-void tst_qmlengine::valueTypeFunctions()
-{
-    QmlComponent component(&engine, SRCDIR "/functions.qml");
-    MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create());
-    QCOMPARE(obj->rectProperty(), QRect(0,0,100,100));
-    QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5));
-}
-
-QTEST_MAIN(tst_qmlengine)
-
-#include "tst_qmlengine.moc"
diff --git a/tests/auto/declarative/qmlparser/Alias.qml b/tests/auto/declarative/qmlparser/data/Alias.qml
index 8264e0d..8264e0d 100644
--- a/tests/auto/declarative/qmlparser/Alias.qml
+++ b/tests/auto/declarative/qmlparser/data/Alias.qml
diff --git a/tests/auto/declarative/qmlparser/MyComponent.qml b/tests/auto/declarative/qmlparser/data/MyComponent.qml
index 1a23277..1a23277 100644
--- a/tests/auto/declarative/qmlparser/MyComponent.qml
+++ b/tests/auto/declarative/qmlparser/data/MyComponent.qml
diff --git a/tests/auto/declarative/qmlparser/MyContainerComponent.qml b/tests/auto/declarative/qmlparser/data/MyContainerComponent.qml
index 61f54c5..61f54c5 100644
--- a/tests/auto/declarative/qmlparser/MyContainerComponent.qml
+++ b/tests/auto/declarative/qmlparser/data/MyContainerComponent.qml
diff --git a/tests/auto/declarative/qmlparser/alias.1.qml b/tests/auto/declarative/qmlparser/data/alias.1.qml
index 492d99a..492d99a 100644
--- a/tests/auto/declarative/qmlparser/alias.1.qml
+++ b/tests/auto/declarative/qmlparser/data/alias.1.qml
diff --git a/tests/auto/declarative/qmlparser/alias.2.qml b/tests/auto/declarative/qmlparser/data/alias.2.qml
index aa4d103..aa4d103 100644
--- a/tests/auto/declarative/qmlparser/alias.2.qml
+++ b/tests/auto/declarative/qmlparser/data/alias.2.qml
diff --git a/tests/auto/declarative/qmlparser/alias.3.qml b/tests/auto/declarative/qmlparser/data/alias.3.qml
index e25fbae..e25fbae 100644
--- a/tests/auto/declarative/qmlparser/alias.3.qml
+++ b/tests/auto/declarative/qmlparser/data/alias.3.qml
diff --git a/tests/auto/declarative/qmlparser/assignBasicTypes.qml b/tests/auto/declarative/qmlparser/data/assignBasicTypes.qml
index cef9f8d..cef9f8d 100644
--- a/tests/auto/declarative/qmlparser/assignBasicTypes.qml
+++ b/tests/auto/declarative/qmlparser/data/assignBasicTypes.qml
diff --git a/tests/auto/declarative/qmlparser/assignLiteralSignalProperty.qml b/tests/auto/declarative/qmlparser/data/assignLiteralSignalProperty.qml
index 399fcea..399fcea 100644
--- a/tests/auto/declarative/qmlparser/assignLiteralSignalProperty.qml
+++ b/tests/auto/declarative/qmlparser/data/assignLiteralSignalProperty.qml
diff --git a/tests/auto/declarative/qmlparser/assignObjectToSignal.qml b/tests/auto/declarative/qmlparser/data/assignObjectToSignal.qml
index 789cc66..789cc66 100644
--- a/tests/auto/declarative/qmlparser/assignObjectToSignal.qml
+++ b/tests/auto/declarative/qmlparser/data/assignObjectToSignal.qml
diff --git a/tests/auto/declarative/qmlparser/assignObjectToVariant.qml b/tests/auto/declarative/qmlparser/data/assignObjectToVariant.qml
index 28c68c4..28c68c4 100644
--- a/tests/auto/declarative/qmlparser/assignObjectToVariant.qml
+++ b/tests/auto/declarative/qmlparser/data/assignObjectToVariant.qml
diff --git a/tests/auto/declarative/qmlparser/assignQmlComponent.qml b/tests/auto/declarative/qmlparser/data/assignQmlComponent.qml
index 20bdc55..20bdc55 100644
--- a/tests/auto/declarative/qmlparser/assignQmlComponent.qml
+++ b/tests/auto/declarative/qmlparser/data/assignQmlComponent.qml
diff --git a/tests/auto/declarative/qmlparser/assignSignal.qml b/tests/auto/declarative/qmlparser/data/assignSignal.qml
index 3abc04d..3abc04d 100644
--- a/tests/auto/declarative/qmlparser/assignSignal.qml
+++ b/tests/auto/declarative/qmlparser/data/assignSignal.qml
diff --git a/tests/auto/declarative/qmlparser/assignTypeExtremes.qml b/tests/auto/declarative/qmlparser/data/assignTypeExtremes.qml
index 60ede52..60ede52 100644
--- a/tests/auto/declarative/qmlparser/assignTypeExtremes.qml
+++ b/tests/auto/declarative/qmlparser/data/assignTypeExtremes.qml
diff --git a/tests/auto/declarative/qmlparser/attachedProperties.qml b/tests/auto/declarative/qmlparser/data/attachedProperties.qml
index 8343754..8343754 100644
--- a/tests/auto/declarative/qmlparser/attachedProperties.qml
+++ b/tests/auto/declarative/qmlparser/data/attachedProperties.qml
diff --git a/tests/auto/declarative/qmlparser/autoComponentCreation.qml b/tests/auto/declarative/qmlparser/data/autoComponentCreation.qml
index 5d00144..5d00144 100644
--- a/tests/auto/declarative/qmlparser/autoComponentCreation.qml
+++ b/tests/auto/declarative/qmlparser/data/autoComponentCreation.qml
diff --git a/tests/auto/declarative/qmlparser/cppnamespace.qml b/tests/auto/declarative/qmlparser/data/cppnamespace.qml
index e1daf3b..e1daf3b 100644
--- a/tests/auto/declarative/qmlparser/cppnamespace.qml
+++ b/tests/auto/declarative/qmlparser/data/cppnamespace.qml
diff --git a/tests/auto/declarative/qmlparser/customParserIdNotAllowed.errors.txt b/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.errors.txt
index d28c0bd..d28c0bd 100644
--- a/tests/auto/declarative/qmlparser/customParserIdNotAllowed.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.errors.txt
diff --git a/tests/auto/declarative/qmlparser/customParserIdNotAllowed.qml b/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.qml
index e607768..e607768 100644
--- a/tests/auto/declarative/qmlparser/customParserIdNotAllowed.qml
+++ b/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.qml
diff --git a/tests/auto/declarative/qmlparser/customParserTypes.qml b/tests/auto/declarative/qmlparser/data/customParserTypes.qml
index cf2f272..cf2f272 100644
--- a/tests/auto/declarative/qmlparser/customParserTypes.qml
+++ b/tests/auto/declarative/qmlparser/data/customParserTypes.qml
diff --git a/tests/auto/declarative/qmlparser/customVariantTypes.qml b/tests/auto/declarative/qmlparser/data/customVariantTypes.qml
index 0263ed2..0263ed2 100644
--- a/tests/auto/declarative/qmlparser/customVariantTypes.qml
+++ b/tests/auto/declarative/qmlparser/data/customVariantTypes.qml
diff --git a/tests/auto/declarative/qmlparser/duplicateIDs.errors.txt b/tests/auto/declarative/qmlparser/data/duplicateIDs.errors.txt
index 66241cf..66241cf 100644
--- a/tests/auto/declarative/qmlparser/duplicateIDs.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/duplicateIDs.errors.txt
diff --git a/tests/auto/declarative/qmlparser/duplicateIDs.qml b/tests/auto/declarative/qmlparser/data/duplicateIDs.qml
index 9605b5b..9605b5b 100644
--- a/tests/auto/declarative/qmlparser/duplicateIDs.qml
+++ b/tests/auto/declarative/qmlparser/data/duplicateIDs.qml
diff --git a/tests/auto/declarative/qmlparser/dynamicObject.1.qml b/tests/auto/declarative/qmlparser/data/dynamicObject.1.qml
index 85d1052..85d1052 100644
--- a/tests/auto/declarative/qmlparser/dynamicObject.1.qml
+++ b/tests/auto/declarative/qmlparser/data/dynamicObject.1.qml
diff --git a/tests/auto/declarative/qmlparser/dynamicProperties.qml b/tests/auto/declarative/qmlparser/data/dynamicProperties.qml
index f93e446..f93e446 100644
--- a/tests/auto/declarative/qmlparser/dynamicProperties.qml
+++ b/tests/auto/declarative/qmlparser/data/dynamicProperties.qml
diff --git a/tests/auto/declarative/qmlparser/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qmlparser/data/dynamicSignalsAndSlots.qml
index b0ca970..b0ca970 100644
--- a/tests/auto/declarative/qmlparser/dynamicSignalsAndSlots.qml
+++ b/tests/auto/declarative/qmlparser/data/dynamicSignalsAndSlots.qml
diff --git a/tests/auto/declarative/qmlparser/empty.errors.txt b/tests/auto/declarative/qmlparser/data/empty.errors.txt
index d416e76..d416e76 100644
--- a/tests/auto/declarative/qmlparser/empty.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/empty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/empty.qml b/tests/auto/declarative/qmlparser/data/empty.qml
index e69de29..e69de29 100644
--- a/tests/auto/declarative/qmlparser/empty.qml
+++ b/tests/auto/declarative/qmlparser/data/empty.qml
diff --git a/tests/auto/declarative/qmlparser/failingComponent.errors.txt b/tests/auto/declarative/qmlparser/data/failingComponent.errors.txt
index 0cf0ef3..0cf0ef3 100644
--- a/tests/auto/declarative/qmlparser/failingComponent.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/failingComponent.errors.txt
diff --git a/tests/auto/declarative/qmlparser/failingComponentTest.qml b/tests/auto/declarative/qmlparser/data/failingComponentTest.qml
index 74a6acf..74a6acf 100644
--- a/tests/auto/declarative/qmlparser/failingComponentTest.qml
+++ b/tests/auto/declarative/qmlparser/data/failingComponentTest.qml
diff --git a/tests/auto/declarative/qmlparser/fakeDotProperty.errors.txt b/tests/auto/declarative/qmlparser/data/fakeDotProperty.errors.txt
index e56ad3a..e56ad3a 100644
--- a/tests/auto/declarative/qmlparser/fakeDotProperty.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/fakeDotProperty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/fakeDotProperty.qml b/tests/auto/declarative/qmlparser/data/fakeDotProperty.qml
index d971eee..d971eee 100644
--- a/tests/auto/declarative/qmlparser/fakeDotProperty.qml
+++ b/tests/auto/declarative/qmlparser/data/fakeDotProperty.qml
diff --git a/tests/auto/declarative/qmlparser/finalOverride.errors.txt b/tests/auto/declarative/qmlparser/data/finalOverride.errors.txt
index 49e06cb..49e06cb 100644
--- a/tests/auto/declarative/qmlparser/finalOverride.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/finalOverride.errors.txt
diff --git a/tests/auto/declarative/qmlparser/finalOverride.qml b/tests/auto/declarative/qmlparser/data/finalOverride.qml
index a84393a..a84393a 100644
--- a/tests/auto/declarative/qmlparser/finalOverride.qml
+++ b/tests/auto/declarative/qmlparser/data/finalOverride.qml
diff --git a/tests/auto/declarative/qmlparser/idProperty.qml b/tests/auto/declarative/qmlparser/data/idProperty.qml
index a413c0b..a413c0b 100644
--- a/tests/auto/declarative/qmlparser/idProperty.qml
+++ b/tests/auto/declarative/qmlparser/data/idProperty.qml
diff --git a/tests/auto/declarative/qmlparser/importNamespaceConflict.errors.txt b/tests/auto/declarative/qmlparser/data/importNamespaceConflict.errors.txt
index 231998d..231998d 100644
--- a/tests/auto/declarative/qmlparser/importNamespaceConflict.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/importNamespaceConflict.errors.txt
diff --git a/tests/auto/declarative/qmlparser/importNamespaceConflict.qml b/tests/auto/declarative/qmlparser/data/importNamespaceConflict.qml
index cd112af..cd112af 100644
--- a/tests/auto/declarative/qmlparser/importNamespaceConflict.qml
+++ b/tests/auto/declarative/qmlparser/data/importNamespaceConflict.qml
diff --git a/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.errors.txt b/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.errors.txt
index 2235cbc..2235cbc 100644
--- a/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.errors.txt
diff --git a/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.qml b/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.qml
index 23ed566..23ed566 100644
--- a/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.qml
+++ b/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.qml
diff --git a/tests/auto/declarative/qmlparser/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.errors.txt
index 2235cbc..2235cbc 100644
--- a/tests/auto/declarative/qmlparser/importVersionMissingInstalled.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.errors.txt
diff --git a/tests/auto/declarative/qmlparser/importVersionMissingInstalled.qml b/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.qml
index 97ec222..97ec222 100644
--- a/tests/auto/declarative/qmlparser/importVersionMissingInstalled.qml
+++ b/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.qml
diff --git a/tests/auto/declarative/qmlparser/inlineQmlComponents.qml b/tests/auto/declarative/qmlparser/data/inlineQmlComponents.qml
index 79ceda6..79ceda6 100644
--- a/tests/auto/declarative/qmlparser/inlineQmlComponents.qml
+++ b/tests/auto/declarative/qmlparser/data/inlineQmlComponents.qml
diff --git a/tests/auto/declarative/qmlparser/interfaceProperty.qml b/tests/auto/declarative/qmlparser/data/interfaceProperty.qml
index 70879ff..70879ff 100644
--- a/tests/auto/declarative/qmlparser/interfaceProperty.qml
+++ b/tests/auto/declarative/qmlparser/data/interfaceProperty.qml
diff --git a/tests/auto/declarative/qmlparser/interfaceQList.qml b/tests/auto/declarative/qmlparser/data/interfaceQList.qml
index c87dfae..c87dfae 100644
--- a/tests/auto/declarative/qmlparser/interfaceQList.qml
+++ b/tests/auto/declarative/qmlparser/data/interfaceQList.qml
diff --git a/tests/auto/declarative/qmlparser/interfaceQmlList.qml b/tests/auto/declarative/qmlparser/data/interfaceQmlList.qml
index 8392bea..8392bea 100644
--- a/tests/auto/declarative/qmlparser/interfaceQmlList.qml
+++ b/tests/auto/declarative/qmlparser/data/interfaceQmlList.qml
diff --git a/tests/auto/declarative/qmlparser/invalidID.2.errors.txt b/tests/auto/declarative/qmlparser/data/invalidID.2.errors.txt
index 56e3eeb..56e3eeb 100644
--- a/tests/auto/declarative/qmlparser/invalidID.2.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/invalidID.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/invalidID.2.qml b/tests/auto/declarative/qmlparser/data/invalidID.2.qml
index 4fb3b29..4fb3b29 100644
--- a/tests/auto/declarative/qmlparser/invalidID.2.qml
+++ b/tests/auto/declarative/qmlparser/data/invalidID.2.qml
diff --git a/tests/auto/declarative/qmlparser/invalidID.3.errors.txt b/tests/auto/declarative/qmlparser/data/invalidID.3.errors.txt
index bb811cf..bb811cf 100644
--- a/tests/auto/declarative/qmlparser/invalidID.3.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/invalidID.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/invalidID.3.qml b/tests/auto/declarative/qmlparser/data/invalidID.3.qml
index 6684172..6684172 100644
--- a/tests/auto/declarative/qmlparser/invalidID.3.qml
+++ b/tests/auto/declarative/qmlparser/data/invalidID.3.qml
diff --git a/tests/auto/declarative/qmlparser/invalidID.4.errors.txt b/tests/auto/declarative/qmlparser/data/invalidID.4.errors.txt
index cfe8756..cfe8756 100644
--- a/tests/auto/declarative/qmlparser/invalidID.4.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/invalidID.4.errors.txt
diff --git a/tests/auto/declarative/qmlparser/invalidID.4.qml b/tests/auto/declarative/qmlparser/data/invalidID.4.qml
index 1f15fce..1f15fce 100644
--- a/tests/auto/declarative/qmlparser/invalidID.4.qml
+++ b/tests/auto/declarative/qmlparser/data/invalidID.4.qml
diff --git a/tests/auto/declarative/qmlparser/invalidID.5.errors.txt b/tests/auto/declarative/qmlparser/data/invalidID.5.errors.txt
index b0a63a0..b0a63a0 100644
--- a/tests/auto/declarative/qmlparser/invalidID.5.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/invalidID.5.errors.txt
diff --git a/tests/auto/declarative/qmlparser/invalidID.5.qml b/tests/auto/declarative/qmlparser/data/invalidID.5.qml
index 0545b0d..0545b0d 100644
--- a/tests/auto/declarative/qmlparser/invalidID.5.qml
+++ b/tests/auto/declarative/qmlparser/data/invalidID.5.qml
diff --git a/tests/auto/declarative/qmlparser/invalidID.6.errors.txt b/tests/auto/declarative/qmlparser/data/invalidID.6.errors.txt
index 861e3d7..861e3d7 100644
--- a/tests/auto/declarative/qmlparser/invalidID.6.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/invalidID.6.errors.txt
diff --git a/tests/auto/declarative/qmlparser/invalidID.6.qml b/tests/auto/declarative/qmlparser/data/invalidID.6.qml
index ea34007..ea34007 100644
--- a/tests/auto/declarative/qmlparser/invalidID.6.qml
+++ b/tests/auto/declarative/qmlparser/data/invalidID.6.qml
diff --git a/tests/auto/declarative/qmlparser/invalidID.errors.txt b/tests/auto/declarative/qmlparser/data/invalidID.errors.txt
index 1ca678c..1ca678c 100644
--- a/tests/auto/declarative/qmlparser/invalidID.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/invalidID.errors.txt
diff --git a/tests/auto/declarative/qmlparser/invalidID.qml b/tests/auto/declarative/qmlparser/data/invalidID.qml
index 04db3eb..04db3eb 100644
--- a/tests/auto/declarative/qmlparser/invalidID.qml
+++ b/tests/auto/declarative/qmlparser/data/invalidID.qml
diff --git a/tests/auto/declarative/qmlparser/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest.qml
index d8a22a8..d8a22a8 100644
--- a/tests/auto/declarative/qmlparser/lib/com/nokia/installedtest/InstalledTest.qml
+++ b/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest.qml
diff --git a/tests/auto/declarative/qmlparser/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest2.qml
index a0706ad..a0706ad 100644
--- a/tests/auto/declarative/qmlparser/lib/com/nokia/installedtest/InstalledTest2.qml
+++ b/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest2.qml
diff --git a/tests/auto/declarative/qmlparser/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/qmldir
index ba0b42a..ba0b42a 100644
--- a/tests/auto/declarative/qmlparser/lib/com/nokia/installedtest/qmldir
+++ b/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/qmldir
diff --git a/tests/auto/declarative/qmlparser/listAssignment.1.errors.txt b/tests/auto/declarative/qmlparser/data/listAssignment.1.errors.txt
index d68d487..d68d487 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.1.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/listAssignment.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/listAssignment.1.qml b/tests/auto/declarative/qmlparser/data/listAssignment.1.qml
index 4240425..4240425 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.1.qml
+++ b/tests/auto/declarative/qmlparser/data/listAssignment.1.qml
diff --git a/tests/auto/declarative/qmlparser/listAssignment.2.errors.txt b/tests/auto/declarative/qmlparser/data/listAssignment.2.errors.txt
index 8b40aa3..8b40aa3 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.2.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/listAssignment.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/listAssignment.2.qml b/tests/auto/declarative/qmlparser/data/listAssignment.2.qml
index e3baadb..e3baadb 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.2.qml
+++ b/tests/auto/declarative/qmlparser/data/listAssignment.2.qml
diff --git a/tests/auto/declarative/qmlparser/listAssignment.3.errors.txt b/tests/auto/declarative/qmlparser/data/listAssignment.3.errors.txt
index 8c7b7e9..8c7b7e9 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.3.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/listAssignment.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/listAssignment.3.qml b/tests/auto/declarative/qmlparser/data/listAssignment.3.qml
index 00c4c6b..00c4c6b 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.3.qml
+++ b/tests/auto/declarative/qmlparser/data/listAssignment.3.qml
diff --git a/tests/auto/declarative/qmlparser/listItemDeleteSelf.qml b/tests/auto/declarative/qmlparser/data/listItemDeleteSelf.qml
index fa2e831..fa2e831 100644
--- a/tests/auto/declarative/qmlparser/listItemDeleteSelf.qml
+++ b/tests/auto/declarative/qmlparser/data/listItemDeleteSelf.qml
diff --git a/tests/auto/declarative/qmlparser/missingObject.errors.txt b/tests/auto/declarative/qmlparser/data/missingObject.errors.txt
index b31b562..b31b562 100644
--- a/tests/auto/declarative/qmlparser/missingObject.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/missingObject.errors.txt
diff --git a/tests/auto/declarative/qmlparser/missingObject.qml b/tests/auto/declarative/qmlparser/data/missingObject.qml
index 2f17045..2f17045 100644
--- a/tests/auto/declarative/qmlparser/missingObject.qml
+++ b/tests/auto/declarative/qmlparser/data/missingObject.qml
diff --git a/tests/auto/declarative/qmlparser/missingSignal.errors.txt b/tests/auto/declarative/qmlparser/data/missingSignal.errors.txt
index e243ae5..e243ae5 100644
--- a/tests/auto/declarative/qmlparser/missingSignal.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/missingSignal.errors.txt
diff --git a/tests/auto/declarative/qmlparser/missingSignal.qml b/tests/auto/declarative/qmlparser/data/missingSignal.qml
index fd489ca..fd489ca 100644
--- a/tests/auto/declarative/qmlparser/missingSignal.qml
+++ b/tests/auto/declarative/qmlparser/data/missingSignal.qml
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.1.errors.txt b/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.errors.txt
index cfc6fc8..cfc6fc8 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.1.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.1.qml b/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.qml
index df7406c..df7406c 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.1.qml
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.qml
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.2.errors.txt b/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.errors.txt
index 8b13585..8b13585 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.2.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.2.qml b/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.qml
index 06ccd37..06ccd37 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.2.qml
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.qml
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.3.errors.txt b/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.errors.txt
index 8b13585..8b13585 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.3.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.3.qml b/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.qml
index 5b08608..5b08608 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.3.qml
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.qml
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.4.errors.txt b/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.errors.txt
index 8b13585..8b13585 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.4.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.errors.txt
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.4.qml b/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.qml
index 6579191..6579191 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.4.qml
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.qml
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.5.errors.txt b/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.errors.txt
index c07f2b9..c07f2b9 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.5.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.errors.txt
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.5.qml b/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.qml
index 37af057..37af057 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.5.qml
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.qml
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.6.errors.txt b/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.errors.txt
index c02d7bd..c02d7bd 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.6.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.errors.txt
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.6.qml b/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.qml
index 5cd55d0..5cd55d0 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.6.qml
+++ b/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.qml
diff --git a/tests/auto/declarative/qmlparser/nullDotProperty.errors.txt b/tests/auto/declarative/qmlparser/data/nullDotProperty.errors.txt
index 07a4094..07a4094 100644
--- a/tests/auto/declarative/qmlparser/nullDotProperty.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/nullDotProperty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/nullDotProperty.qml b/tests/auto/declarative/qmlparser/data/nullDotProperty.qml
index 4e36779..4e36779 100644
--- a/tests/auto/declarative/qmlparser/nullDotProperty.qml
+++ b/tests/auto/declarative/qmlparser/data/nullDotProperty.qml
diff --git a/tests/auto/declarative/qmlparser/propertyValueSource.qml b/tests/auto/declarative/qmlparser/data/propertyValueSource.qml
index ad71fcf..ad71fcf 100644
--- a/tests/auto/declarative/qmlparser/propertyValueSource.qml
+++ b/tests/auto/declarative/qmlparser/data/propertyValueSource.qml
diff --git a/tests/auto/declarative/qmlparser/readOnly.1.errors.txt b/tests/auto/declarative/qmlparser/data/readOnly.1.errors.txt
index b8c3404..b8c3404 100644
--- a/tests/auto/declarative/qmlparser/readOnly.1.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/readOnly.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/readOnly.1.qml b/tests/auto/declarative/qmlparser/data/readOnly.1.qml
index 60757bd..60757bd 100644
--- a/tests/auto/declarative/qmlparser/readOnly.1.qml
+++ b/tests/auto/declarative/qmlparser/data/readOnly.1.qml
diff --git a/tests/auto/declarative/qmlparser/readOnly.2.errors.txt b/tests/auto/declarative/qmlparser/data/readOnly.2.errors.txt
index d857a04..d857a04 100644
--- a/tests/auto/declarative/qmlparser/readOnly.2.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/readOnly.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/readOnly.2.qml b/tests/auto/declarative/qmlparser/data/readOnly.2.qml
index 8f1633c..8f1633c 100644
--- a/tests/auto/declarative/qmlparser/readOnly.2.qml
+++ b/tests/auto/declarative/qmlparser/data/readOnly.2.qml
diff --git a/tests/auto/declarative/qmlparser/rootAsQmlComponent.qml b/tests/auto/declarative/qmlparser/data/rootAsQmlComponent.qml
index 8d72cd3..8d72cd3 100644
--- a/tests/auto/declarative/qmlparser/rootAsQmlComponent.qml
+++ b/tests/auto/declarative/qmlparser/data/rootAsQmlComponent.qml
diff --git a/tests/auto/declarative/qmlparser/simpleBindings.qml b/tests/auto/declarative/qmlparser/data/simpleBindings.qml
index 74867b3..74867b3 100644
--- a/tests/auto/declarative/qmlparser/simpleBindings.qml
+++ b/tests/auto/declarative/qmlparser/data/simpleBindings.qml
diff --git a/tests/auto/declarative/qmlparser/simpleContainer.qml b/tests/auto/declarative/qmlparser/data/simpleContainer.qml
index c3a795f..c3a795f 100644
--- a/tests/auto/declarative/qmlparser/simpleContainer.qml
+++ b/tests/auto/declarative/qmlparser/data/simpleContainer.qml
diff --git a/tests/auto/declarative/qmlparser/simpleObject.qml b/tests/auto/declarative/qmlparser/data/simpleObject.qml
index 30c7823..30c7823 100644
--- a/tests/auto/declarative/qmlparser/simpleObject.qml
+++ b/tests/auto/declarative/qmlparser/data/simpleObject.qml
diff --git a/tests/auto/declarative/qmlparser/subdir/Test.qml b/tests/auto/declarative/qmlparser/data/subdir/Test.qml
index c4d5905..c4d5905 100644
--- a/tests/auto/declarative/qmlparser/subdir/Test.qml
+++ b/tests/auto/declarative/qmlparser/data/subdir/Test.qml
diff --git a/tests/auto/declarative/qmlparser/unregisteredObject.errors.txt b/tests/auto/declarative/qmlparser/data/unregisteredObject.errors.txt
index bc4f7f4..bc4f7f4 100644
--- a/tests/auto/declarative/qmlparser/unregisteredObject.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/unregisteredObject.errors.txt
diff --git a/tests/auto/declarative/qmlparser/unregisteredObject.qml b/tests/auto/declarative/qmlparser/data/unregisteredObject.qml
index 9498e31..9498e31 100644
--- a/tests/auto/declarative/qmlparser/unregisteredObject.qml
+++ b/tests/auto/declarative/qmlparser/data/unregisteredObject.qml
diff --git a/tests/auto/declarative/qmlparser/unsupportedProperty.errors.txt b/tests/auto/declarative/qmlparser/data/unsupportedProperty.errors.txt
index 3a90a7d..3a90a7d 100644
--- a/tests/auto/declarative/qmlparser/unsupportedProperty.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/unsupportedProperty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/unsupportedProperty.qml b/tests/auto/declarative/qmlparser/data/unsupportedProperty.qml
index 9f19680..9f19680 100644
--- a/tests/auto/declarative/qmlparser/unsupportedProperty.qml
+++ b/tests/auto/declarative/qmlparser/data/unsupportedProperty.qml
diff --git a/tests/auto/declarative/qmlparser/valueTypes.qml b/tests/auto/declarative/qmlparser/data/valueTypes.qml
index bf325a7..bf325a7 100644
--- a/tests/auto/declarative/qmlparser/valueTypes.qml
+++ b/tests/auto/declarative/qmlparser/data/valueTypes.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.1.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.1.errors.txt
index ba7a076..ba7a076 100644
--- a/tests/auto/declarative/qmlparser/wrongType.1.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.1.qml b/tests/auto/declarative/qmlparser/data/wrongType.1.qml
index 289d37f..289d37f 100644
--- a/tests/auto/declarative/qmlparser/wrongType.1.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.1.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.10.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.10.errors.txt
index ae75b52..ae75b52 100644
--- a/tests/auto/declarative/qmlparser/wrongType.10.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.10.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.10.qml b/tests/auto/declarative/qmlparser/data/wrongType.10.qml
index 2cf0e50..2cf0e50 100644
--- a/tests/auto/declarative/qmlparser/wrongType.10.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.10.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.11.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.11.errors.txt
index 23a4cda..23a4cda 100644
--- a/tests/auto/declarative/qmlparser/wrongType.11.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.11.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.11.qml b/tests/auto/declarative/qmlparser/data/wrongType.11.qml
index ae77ba1..ae77ba1 100644
--- a/tests/auto/declarative/qmlparser/wrongType.11.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.11.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.12.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.12.errors.txt
index 3092100..3092100 100644
--- a/tests/auto/declarative/qmlparser/wrongType.12.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.12.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.12.qml b/tests/auto/declarative/qmlparser/data/wrongType.12.qml
index b7a366f..b7a366f 100644
--- a/tests/auto/declarative/qmlparser/wrongType.12.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.12.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.13.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.13.errors.txt
index ba7a076..ba7a076 100644
--- a/tests/auto/declarative/qmlparser/wrongType.13.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.13.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.13.qml b/tests/auto/declarative/qmlparser/data/wrongType.13.qml
index 477aff1..477aff1 100644
--- a/tests/auto/declarative/qmlparser/wrongType.13.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.13.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.14.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.14.errors.txt
index d621fdd..d621fdd 100644
--- a/tests/auto/declarative/qmlparser/wrongType.14.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.14.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.14.qml b/tests/auto/declarative/qmlparser/data/wrongType.14.qml
index 672d693..672d693 100644
--- a/tests/auto/declarative/qmlparser/wrongType.14.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.14.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.2.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.2.errors.txt
index 9ff9f25..9ff9f25 100644
--- a/tests/auto/declarative/qmlparser/wrongType.2.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.2.qml b/tests/auto/declarative/qmlparser/data/wrongType.2.qml
index 34b74f7..34b74f7 100644
--- a/tests/auto/declarative/qmlparser/wrongType.2.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.2.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.3.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.3.errors.txt
index 6d971c6..6d971c6 100644
--- a/tests/auto/declarative/qmlparser/wrongType.3.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.3.qml b/tests/auto/declarative/qmlparser/data/wrongType.3.qml
index 384181a..384181a 100644
--- a/tests/auto/declarative/qmlparser/wrongType.3.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.3.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.4.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.4.errors.txt
index ef34d0e..ef34d0e 100644
--- a/tests/auto/declarative/qmlparser/wrongType.4.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.4.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.4.qml b/tests/auto/declarative/qmlparser/data/wrongType.4.qml
index 0787bf5..0787bf5 100644
--- a/tests/auto/declarative/qmlparser/wrongType.4.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.4.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.5.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.5.errors.txt
index cab10bd..cab10bd 100644
--- a/tests/auto/declarative/qmlparser/wrongType.5.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.5.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.5.qml b/tests/auto/declarative/qmlparser/data/wrongType.5.qml
index c50ae9a..c50ae9a 100644
--- a/tests/auto/declarative/qmlparser/wrongType.5.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.5.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.6.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.6.errors.txt
index d0a0b00..d0a0b00 100644
--- a/tests/auto/declarative/qmlparser/wrongType.6.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.6.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.6.qml b/tests/auto/declarative/qmlparser/data/wrongType.6.qml
index da10b78..da10b78 100644
--- a/tests/auto/declarative/qmlparser/wrongType.6.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.6.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.7.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.7.errors.txt
index 614346b..614346b 100644
--- a/tests/auto/declarative/qmlparser/wrongType.7.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.7.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.7.qml b/tests/auto/declarative/qmlparser/data/wrongType.7.qml
index ddc3835..ddc3835 100644
--- a/tests/auto/declarative/qmlparser/wrongType.7.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.7.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.8.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.8.errors.txt
index 1773c00..1773c00 100644
--- a/tests/auto/declarative/qmlparser/wrongType.8.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.8.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.8.qml b/tests/auto/declarative/qmlparser/data/wrongType.8.qml
index a5f6756..a5f6756 100644
--- a/tests/auto/declarative/qmlparser/wrongType.8.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.8.qml
diff --git a/tests/auto/declarative/qmlparser/wrongType.9.errors.txt b/tests/auto/declarative/qmlparser/data/wrongType.9.errors.txt
index 8630975..8630975 100644
--- a/tests/auto/declarative/qmlparser/wrongType.9.errors.txt
+++ b/tests/auto/declarative/qmlparser/data/wrongType.9.errors.txt
diff --git a/tests/auto/declarative/qmlparser/wrongType.9.qml b/tests/auto/declarative/qmlparser/data/wrongType.9.qml
index a3db732..a3db732 100644
--- a/tests/auto/declarative/qmlparser/wrongType.9.qml
+++ b/tests/auto/declarative/qmlparser/data/wrongType.9.qml
diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
index c2f1e1a..7f51639 100644
--- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
+++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
@@ -14,7 +14,7 @@ public:
     tst_qmlparser() {
         QmlMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter);
         QFileInfo fileInfo(__FILE__);
-        engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("lib")));
+        engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("data/lib")));
     }
 
 private slots:
@@ -74,7 +74,7 @@ private:
         QVERIFY(!component.isError()); \
         QVERIFY(component.errors().isEmpty()); \
     } else { \
-        QFile file(errorfile); \
+        QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
         QVERIFY(file.open(QIODevice::ReadOnly)); \
         QByteArray data = file.readAll(); \
         QList<QByteArray> expected = data.split('\n'); \
@@ -96,7 +96,7 @@ private:
 inline QUrl TEST_FILE(const QString &filename)
 {
     QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename));
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(QLatin1String("data/") + filename));
 }
 
 inline QUrl TEST_FILE(const char *filename)