170 files changed, 357 insertions, 129 deletions

diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml
index 278eeb3..2b0d983 100644
--- a/demos/declarative/contacts/contacts.qml
+++ b/demos/declarative/contacts/contacts.qml
@@ -224,7 +224,7 @@ Rectangle {
                 }
             }
         ]
-        autoHighlight: true
+        highlightFollowsCurrentItem: true
         focus: false
     }
     FocusScope {
@@ -291,7 +291,7 @@ Rectangle {
         ]
     }
     focus: contacts.mode != 'new'
-    forwardTo: { contacts.mode == "list" ? [searchBarWrapper, contactListView] : [contactListView]}
+    Keys.forwardTo: { contacts.mode == "list" ? [searchBarWrapper, contactListView] : [contactListView]}
     states: [
         State {
             name: "editNewState"
diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml
index 7d73900..9d63e69 100644
--- a/examples/declarative/aspectratio/face_fit_animated.qml
+++ b/examples/declarative/aspectratio/face_fit_animated.qml
@@ -17,8 +17,8 @@ Rectangle {
         x: (parent.width-width*scale)/2
         y: (parent.height-height*scale)/2
         scale: SpringFollow {
-            source: Math.max(Math.min(Image.parent.width/Image.width*1.333,Image.parent.height/Image.height),
-                        Math.min(Image.parent.width/Image.width,Image.parent.height/Image.height*1.333))
+            source: Math.max(Math.min(Face.parent.width/Face.width*1.333,Face.parent.height/Face.height),
+                        Math.min(Face.parent.width/Face.width,Face.parent.height/Face.height*1.333))
             spring: 1
             damping: 0.05
         }
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml
index cb92ad9..b6db453 100644
--- a/examples/declarative/listview/highlight.qml
+++ b/examples/declarative/listview/highlight.qml
@@ -37,7 +37,7 @@ Rectangle {
             ]
         }
     }
-    // Specify a highlight with custom movement.  Note that autoHighlight
+    // Specify a highlight with custom movement.  Note that highlightFollowsCurrentItem
     // is set to false in the ListView so that we can control how the
     // highlight moves to the current item.
     Component {
@@ -51,7 +51,7 @@ Rectangle {
         id: List1
         width: 200; height: parent.height
         model: MyPetsModel; delegate: PetDelegate
-        highlight: PetHighlight; autoHighlight: false
+        highlight: PetHighlight; highlightFollowsCurrentItem: false
         focus: true
     }
 }
diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp
index 84804ce..5ef7b10 100644
--- a/src/declarative/fx/qfxrepeater.cpp
+++ b/src/declarative/fx/qfxrepeater.cpp
@@ -282,14 +282,26 @@ void QFxRepeater::regenerate()
     if (!d->model || !d->model->count() || !d->model->isValid() || !parentItem() || !isComponentComplete())
         return;
 
-    if (d->model) {
-        for (int ii = 0; ii < count(); ++ii) {
-            QFxItem *item = d->model->item(ii);
-            if (item) {
-                item->setParent(parentItem());
-                d->deletables << item;
-            }
+    //In order to do the insertion like the examples, we have to be at the
+    //same point in the childItems() list. Temporary measure until we think of something better
+    int pos = parentItem()->childItems().indexOf(this);
+    Q_ASSERT(pos != -1);
+    QList<QGraphicsItem*> otherChildren;
+    for (int ii = pos+1; ii < parentItem()->childItems().count(); ii++){
+        QGraphicsItem* otherChild = parentItem()->childItems()[ii];
+        otherChildren << otherChild;
+        otherChild->setParentItem(0);
+    }
+
+    for (int ii = 0; ii < count(); ++ii) {
+        QFxItem *item = d->model->item(ii);
+        if (item) {
+            item->setParent(parentItem());
+            d->deletables << item;
         }
     }
+
+    foreach(QGraphicsItem* other, otherChildren)
+        other->setParentItem(parentItem());
 }
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index f7b92a4..ce06348 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -1051,7 +1051,8 @@ void QFxTextEdit::updateSize()
         if(d->cursor)
             cursorWidth = d->cursor->width();
         newWidth += cursorWidth;
-        newWidth += 3;// ### Need a better way of ensuring cursor is in width
+        if(!d->document->isEmpty())
+            newWidth += 3;// ### Need a better way of accounting for space between char and cursor
         setImplicitWidth(newWidth);
         setImplicitHeight(d->text.isEmpty() ? fm.height() : (int)d->document->size().height());
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 0efb5c8..72603ed 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -730,7 +730,7 @@ void QmlDeclarativeData::destroyed(QObject *object)
 
 bool QmlDeclarativeData::hasBindingBit(int bit) const
 {
-    if (bindingBitsSize >= bit) 
+    if (bindingBitsSize > bit) 
         return bindingBits[bit / 32] & (1 << (bit % 32));
     else
         return false;
@@ -738,13 +738,13 @@ bool QmlDeclarativeData::hasBindingBit(int bit) const
 
 void QmlDeclarativeData::clearBindingBit(int bit)
 {
-    if (bindingBitsSize >= bit) 
+    if (bindingBitsSize > bit) 
         bindingBits[bit / 32] &= ~(1 << (bit % 32));
 }
 
 void QmlDeclarativeData::setBindingBit(QObject *obj, int bit)
 {
-    if (bindingBitsSize < bit) {
+    if (bindingBitsSize <= bit) {
         int props = obj->metaObject()->propertyCount();
         Q_ASSERT(bit < props);
 
@@ -1255,7 +1255,8 @@ QmlTypeNameScriptClass::queryProperty(const QScriptValue &scriptObject,
         } else {
             // Must be an attached property
             this->object = qmlAttachedPropertiesObjectById(bridge.type->index(), bridge.object);
-            Q_ASSERT(this->object);
+            if (!this->object)
+                return 0;
             return ep->queryObject(strName, id, this->object);
         }
     }
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 91769d3..efc4a2b 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -119,6 +119,7 @@ QmlMetaObjectCache::property(const QString &name, const QMetaObject *metaObject)
 QmlMetaProperty::QmlMetaProperty()
 : d(new QmlMetaPropertyPrivate)
 {
+    d->q = this;
 }
 
 /*!
@@ -134,7 +135,9 @@ QmlMetaProperty::~QmlMetaProperty()
     default property, an invalid QmlMetaProperty will be created.
  */
 QmlMetaProperty::QmlMetaProperty(QObject *obj)
+: d(new QmlMetaPropertyPrivate)
 {
+    d->q = this;
     d->initDefault(obj);
 }
 
@@ -146,6 +149,7 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj)
 QmlMetaProperty::QmlMetaProperty(QObject *obj, QmlContext *ctxt)
 : d(new QmlMetaPropertyPrivate)
 {
+    d->q = this;
     d->context = ctxt;
     d->initDefault(obj);
 }
@@ -175,6 +179,7 @@ void QmlMetaPropertyPrivate::initDefault(QObject *obj)
 QmlMetaProperty::QmlMetaProperty(QObject *obj, int idx, QmlContext *ctxt)
 : d(new QmlMetaPropertyPrivate)
 {
+    d->q = this;
     d->context = ctxt;
     d->object = obj;
     d->type = Property;
@@ -191,6 +196,7 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, int idx, QmlContext *ctxt)
 QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name)
 : d(new QmlMetaPropertyPrivate)
 {
+    d->q = this;
     d->initProperty(obj, name);
 }
 
@@ -201,6 +207,7 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name)
 QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name, QmlContext *ctxt)
 : d(new QmlMetaPropertyPrivate)
 {
+    d->q = this;
     d->context = ctxt;
     d->initProperty(obj, name);
 }
@@ -276,6 +283,7 @@ void QmlMetaPropertyPrivate::initProperty(QObject *obj, const QString &name)
 QmlMetaProperty::QmlMetaProperty(const QmlMetaProperty &other)
 : d(new QmlMetaPropertyPrivate(*other.d))
 {
+    d->q = this;
 }
 
 /*!
@@ -560,9 +568,10 @@ QmlMetaProperty::setBinding(QmlAbstractBinding *newBinding) const
     if (!isProperty() || (type() & Attached) || !d->object)
         return 0;
 
-    QmlDeclarativeData *data = QmlDeclarativeData::get(d->object, true);
+    QmlDeclarativeData *data = 
+        QmlDeclarativeData::get(d->object, 0 != newBinding);
 
-    if (data->hasBindingBit(d->coreIdx)) {
+    if (data && data->hasBindingBit(d->coreIdx)) {
         QmlAbstractBinding *binding = data->bindings;
         while (binding) {
             // ### This wont work for value types
@@ -584,7 +593,6 @@ QmlMetaProperty::setBinding(QmlAbstractBinding *newBinding) const
 
     return 0;
 }
-
 /*!
     Returns the expression associated with this signal property, or 0 if no 
     signal expression exists.
@@ -743,6 +751,10 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value,
     int writeBackIdx = -1;
     bool deleteWriteBack = false;
 
+    // Remove any existing bindings on this property
+    if (source != QmlMetaProperty::Binding) 
+        delete q->setBinding(0);
+
     if (type & QmlMetaProperty::ValueTypeProperty) {
         QmlEnginePrivate *ep = context?static_cast<QmlEnginePrivate *>(QObjectPrivate::get(context->engine())):0;
 
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index f2d0039..1ccf913 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -85,16 +85,18 @@ class QmlMetaPropertyPrivate
 {
 public:
     QmlMetaPropertyPrivate()
-        : context(0), coreIdx(-1), valueTypeIdx(-1), valueTypeId(0),
+        : q(0), context(0), coreIdx(-1), valueTypeIdx(-1), valueTypeId(0),
           type(QmlMetaProperty::Invalid), attachedFunc(-1), 
           object(0), propType(-1), category(QmlMetaProperty::Unknown) {}
     QmlMetaPropertyPrivate(const QmlMetaPropertyPrivate &other)
-        : name(other.name), signal(other.signal), context(other.context), 
+        : q(0), name(other.name), signal(other.signal), context(other.context), 
           coreIdx(other.coreIdx), valueTypeIdx(other.valueTypeIdx), 
           valueTypeId(other.valueTypeId), type(other.type), 
           attachedFunc(other.attachedFunc), object(other.object), 
           propType(other.propType), category(other.category) {}
 
+    QmlMetaProperty *q;
+
     QString name;
     QMetaMethod signal;
     QmlContext *context;
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 14d8c24..4724278 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -9,13 +9,12 @@ SUBDIRS += datetimeformatter \
            qfxtextedit \
            simplecanvasitem \
            repeater \
-           qmlparser \
-           qmlbindengine \
+           qmllanguage \
+           qmlecmascript \
            qmlmetaproperty \
            qmllist \
            qmllistaccessor \
-           visual\
-           qmlengine
+           visual
 
 # Tests which should run in Pulse
 PULSE_TESTS = $$SUBDIRS
diff --git a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp
index ffbb09b..e38e0e7 100644
--- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp
+++ b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp
@@ -130,7 +130,7 @@ void tst_qfxtextedit::width()
         QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), 0.);
+        QCOMPARE(textEditObject->width(), 1.);//+1 for cursor
     }
 
     for (int i = 0; i < standard.size(); i++)
@@ -144,7 +144,7 @@ void tst_qfxtextedit::width()
         QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), qreal(metricWidth));
+        QCOMPARE(textEditObject->width(), qreal(metricWidth + 1 + 3));//+3 is the current way of accounting for space between cursor and last character.
     }
 
     for (int i = 0; i < richText.size(); i++)
@@ -160,7 +160,7 @@ void tst_qfxtextedit::width()
         QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), qreal(documentWidth));
+        QCOMPARE(textEditObject->width(), qreal(documentWidth + 1 + 3));
     }
 }
 
diff --git a/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp b/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp
index 13a301d..bd0b9c3 100644
--- a/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp
+++ b/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp
@@ -93,7 +93,7 @@ void tst_qfxtextinput::width()
     {
         QFont f;
         QFontMetrics fm(f);
-        int metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
+        int metricWidth = fm.width(standard.at(i));
 
         QString componentStr = "import Qt 4.6\nTextInput { text: \"" + standard.at(i) + "\" }";
         QmlComponent textinputComponent(&engine, componentStr.toLatin1(), QUrl());
@@ -268,43 +268,36 @@ void tst_qfxtextinput::selection()
 
 void tst_qfxtextinput::maxLength()
 {
-    QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
-    canvas->execute();
-    canvas->show();
-
-    QVERIFY(canvas->root() != 0);
-
-    QFxItem *input = qobject_cast<QFxItem *>(qvariant_cast<QObject *>(canvas->root()->property("myInput")));
-
-    QVERIFY(input != 0);
-    //TODO: Me
+    QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
+    QmlComponent textinputComponent(&engine, componentStr.toLatin1(), QUrl());
+    QFxTextInput *textinputObject = qobject_cast<QFxTextInput*>(textinputComponent.create());
+    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject->text().isEmpty());
+    foreach(const QString &str, standard){
+        QVERIFY(textinputObject->text().length() <= 10);
+        textinputObject->setText(str);
+        QVERIFY(textinputObject->text().length() <= 10);
+    }
+    //TODO: Simulated keypress input adding 11 chars at a time
 }
 
 void tst_qfxtextinput::masks()
 {
-    QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
-    canvas->execute();
-    canvas->show();
-
-    QVERIFY(canvas->root() != 0);
-
-    QFxItem *input = qobject_cast<QFxItem *>(qvariant_cast<QObject *>(canvas->root()->property("myInput")));
+    QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
+    QmlComponent textinputComponent(&engine, componentStr.toLatin1(), QUrl());
+    QFxTextInput *textinputObject = qobject_cast<QFxTextInput*>(textinputComponent.create());
+    QVERIFY(textinputObject != 0);
 
-    QVERIFY(input != 0);
     //TODO: Me
 }
 
 void tst_qfxtextinput::validators()
 {
-    QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
-    canvas->execute();
-    canvas->show();
-
-    QVERIFY(canvas->root() != 0);
-
-    QFxItem *input = qobject_cast<QFxItem *>(qvariant_cast<QObject *>(canvas->root()->property("myInput")));
+    QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
+    QmlComponent textinputComponent(&engine, componentStr.toLatin1(), QUrl());
+    QFxTextInput *textinputObject = qobject_cast<QFxTextInput*>(textinputComponent.create());
+    QVERIFY(textinputObject != 0);
 
-    QVERIFY(input != 0);
     //TODO: Me
 }
 
@@ -336,7 +329,7 @@ void tst_qfxtextinput::navigation()
 
 void tst_qfxtextinput::cursorDelegate()
 {
-    //TODO:Get the QFxTextInput test passing first
+    //TODO:Get the QFxTextEdit test passing first
 }
 
 void tst_qfxtextinput::simulateKey(QmlView *view, int key)
diff --git a/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml b/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml
new file mode 100644
index 0000000..b4a702b
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml
@@ -0,0 +1,6 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int c1: 0
+    property int c2: c1
+}
diff --git a/tests/auto/declarative/qmlbindengine/data/bindingLoop.qml b/tests/auto/declarative/qmlecmascript/data/bindingLoop.qml
index 8b22dd1..8b22dd1 100644
--- a/tests/auto/declarative/qmlbindengine/data/bindingLoop.qml
+++ b/tests/auto/declarative/qmlecmascript/data/bindingLoop.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.qml b/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml
index 3147f63..3147f63 100644
--- a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.qml
+++ b/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.qml b/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml
index c89bb49..c89bb49 100644
--- a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.qml
+++ b/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml
new file mode 100644
index 0000000..13c5ae5
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml
@@ -0,0 +1,8 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int c1: 0
+    property int c2: c1
+
+    onBasicSignal: c2 = 13
+}
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml
new file mode 100644
index 0000000..d205526
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property alias c1: MyConstants.c1
+    property alias c2: MyConstants.c2
+
+    objectProperty: ConstantsOverrideBindings { 
+        id: MyConstants
+        c2: 10 
+    }
+}
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml
new file mode 100644
index 0000000..ca9d1d8
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml
@@ -0,0 +1,7 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int c1: 0
+    property int c2: c1
+}
+
diff --git a/tests/auto/declarative/qmlbindengine/data/deferredProperties.qml b/tests/auto/declarative/qmlecmascript/data/deferredProperties.qml
index 9dabafe..9dabafe 100644
--- a/tests/auto/declarative/qmlbindengine/data/deferredProperties.qml
+++ b/tests/auto/declarative/qmlecmascript/data/deferredProperties.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/enums.1.qml b/tests/auto/declarative/qmlecmascript/data/enums.1.qml
index 6351823..6351823 100644
--- a/tests/auto/declarative/qmlbindengine/data/enums.1.qml
+++ b/tests/auto/declarative/qmlecmascript/data/enums.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/enums.2.qml b/tests/auto/declarative/qmlecmascript/data/enums.2.qml
new file mode 100644
index 0000000..bdc672f
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/enums.2.qml
@@ -0,0 +1,8 @@
+import Qt.test 1.0
+import Qt.test 1.0 as Namespace
+
+MyQmlObject {
+    property int a: MyQmlObject.EnumValue10
+    property int b: Namespace.MyQmlObject.EnumValue10
+}
+
diff --git a/tests/auto/declarative/qmlbindengine/data/extensionObjects.qml b/tests/auto/declarative/qmlecmascript/data/extensionObjects.qml
index a902312..a902312 100644
--- a/tests/auto/declarative/qmlbindengine/data/extensionObjects.qml
+++ b/tests/auto/declarative/qmlecmascript/data/extensionObjects.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
index ccb3a22..ccb3a22 100644
--- a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.qml
+++ b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.qml b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
index 6c1fca6..6c1fca6 100644
--- a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.qml
+++ b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/methods.1.qml b/tests/auto/declarative/qmlecmascript/data/methods.1.qml
index 8ba300f..8ba300f 100644
--- a/tests/auto/declarative/qmlbindengine/data/methods.1.qml
+++ b/tests/auto/declarative/qmlecmascript/data/methods.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/methods.2.qml b/tests/auto/declarative/qmlecmascript/data/methods.2.qml
index 70911f7..70911f7 100644
--- a/tests/auto/declarative/qmlbindengine/data/methods.2.qml
+++ b/tests/auto/declarative/qmlecmascript/data/methods.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml b/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml
new file mode 100644
index 0000000..f9585db
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    stringProperty: MyQmlContainer.prop
+}
diff --git a/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml
new file mode 100644
index 0000000..49ada1f
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml
@@ -0,0 +1,14 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property alias c1: MyConstants.c1
+    property alias c2: MyConstants.c2
+    property int c3: 0
+
+    objectProperty: ConstantsOverrideBindings { 
+        id: MyConstants 
+        c2: c3
+    }
+
+}
+
diff --git a/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.qml b/tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml
index fbd0914..fbd0914 100644
--- a/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.qml
+++ b/tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.qml b/tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml
index 8addcb9..8addcb9 100644
--- a/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.qml
+++ b/tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml
diff --git a/tests/auto/declarative/qmlbindengine/data/valueTypeFunctions.qml b/tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml
index 33b4a68..33b4a68 100644
--- a/tests/auto/declarative/qmlbindengine/data/valueTypeFunctions.qml
+++ b/tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml
diff --git a/tests/auto/declarative/qmlbindengine/qmlbindengine.pro b/tests/auto/declarative/qmlecmascript/qmlecmascript.pro
index 4a38ac9..ff4d20f 100644
--- a/tests/auto/declarative/qmlbindengine/qmlbindengine.pro
+++ b/tests/auto/declarative/qmlecmascript/qmlecmascript.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
-SOURCES += tst_qmlbindengine.cpp \
+SOURCES += tst_qmlecmascript.cpp \
            testtypes.cpp
 HEADERS += testtypes.h
 
diff --git a/tests/auto/declarative/qmlbindengine/testtypes.cpp b/tests/auto/declarative/qmlecmascript/testtypes.cpp
index 22e3071..22e3071 100644
--- a/tests/auto/declarative/qmlbindengine/testtypes.cpp
+++ b/tests/auto/declarative/qmlecmascript/testtypes.cpp
diff --git a/tests/auto/declarative/qmlbindengine/testtypes.h b/tests/auto/declarative/qmlecmascript/testtypes.h
index f0302aa..ffc8fec 100644
--- a/tests/auto/declarative/qmlbindengine/testtypes.h
+++ b/tests/auto/declarative/qmlecmascript/testtypes.h
@@ -73,7 +73,7 @@ public slots:
     void setString(const QString &s) { m_string = s; }
 
 private:
-    friend class tst_qmlbindengine;
+    friend class tst_qmlecmascript;
     bool m_methodCalled;
     bool m_methodIntCalled;
 
diff --git a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
index 612220a..7e6d83b 100644
--- a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
+++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
@@ -8,6 +8,12 @@
 #include <QtCore/qdir.h>
 #include "testtypes.h"
 
+/*
+This test covers evaluation of ECMAScript expressions and bindings from within
+QML.  This does not include static QML language issues.
+
+Static QML language issues are covered in qmllanguage
+*/
 inline QUrl TEST_FILE(const QString &filename)
 {
     QFileInfo fileInfo(__FILE__);
@@ -19,11 +25,11 @@ inline QUrl TEST_FILE(const char *filename)
     return TEST_FILE(QLatin1String(filename));
 }
 
-class tst_qmlbindengine : public QObject
+class tst_qmlecmascript : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlbindengine() {}
+    tst_qmlecmascript() {}
 
 private slots:
     void idShortcutInvalidates();
@@ -40,12 +46,15 @@ private slots:
     void extensionObjects();
     void enums();
     void valueTypeFunctions();
+    void constantsOverrideBindings();
+    void outerBindingOverridesInnerBinding();
+    void nonExistantAttachedObject();
 
 private:
     QmlEngine engine;
 };
 
-void tst_qmlbindengine::idShortcutInvalidates()
+void tst_qmlecmascript::idShortcutInvalidates()
 {
     {
         QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
@@ -66,7 +75,7 @@ void tst_qmlbindengine::idShortcutInvalidates()
     }
 }
 
-void tst_qmlbindengine::boolPropertiesEvaluateAsBool()
+void tst_qmlecmascript::boolPropertiesEvaluateAsBool()
 {
     {
         QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
@@ -82,7 +91,7 @@ void tst_qmlbindengine::boolPropertiesEvaluateAsBool()
     }
 }
 
-void tst_qmlbindengine::signalAssignment()
+void tst_qmlecmascript::signalAssignment()
 {
     {
         QmlComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
@@ -103,7 +112,7 @@ void tst_qmlbindengine::signalAssignment()
     }
 }
 
-void tst_qmlbindengine::methods()
+void tst_qmlecmascript::methods()
 {
     {
         QmlComponent component(&engine, TEST_FILE("methods.1.qml"));
@@ -128,7 +137,7 @@ void tst_qmlbindengine::methods()
     }
 }
 
-void tst_qmlbindengine::bindingLoop()
+void tst_qmlecmascript::bindingLoop()
 {
     QmlComponent component(&engine, TEST_FILE("bindingLoop.qml"));
     QTest::ignoreMessage(QtWarningMsg, "QML MyQmlObject (unknown location): Binding loop detected for property \"stringProperty\" ");
@@ -136,7 +145,7 @@ void tst_qmlbindengine::bindingLoop()
     QVERIFY(object != 0);
 }
 
-void tst_qmlbindengine::basicExpressions_data()
+void tst_qmlecmascript::basicExpressions_data()
 {
     QTest::addColumn<QString>("expression");
     QTest::addColumn<QVariant>("result");
@@ -162,7 +171,7 @@ void tst_qmlbindengine::basicExpressions_data()
     QTest::newRow("Context property override default object property") << "millipedeLegs" << QVariant(100) << true;
 }
 
-void tst_qmlbindengine::basicExpressions()
+void tst_qmlecmascript::basicExpressions()
 {
     QFETCH(QString, expression);
     QFETCH(QVariant, result);
@@ -197,7 +206,7 @@ void tst_qmlbindengine::basicExpressions()
 }
 
 Q_DECLARE_METATYPE(QList<QObject *>);
-void tst_qmlbindengine::arrayExpressions()
+void tst_qmlecmascript::arrayExpressions()
 {
     QObject obj1;
     QObject obj2;
@@ -220,7 +229,7 @@ void tst_qmlbindengine::arrayExpressions()
 }
 
 // Tests that modifying a context property will reevaluate expressions
-void tst_qmlbindengine::contextPropertiesTriggerReeval()
+void tst_qmlecmascript::contextPropertiesTriggerReeval()
 {
     QmlContext context(engine.rootContext());
     MyQmlObject object1;
@@ -282,7 +291,7 @@ void tst_qmlbindengine::contextPropertiesTriggerReeval()
 
 }
 
-void tst_qmlbindengine::objectPropertiesTriggerReeval()
+void tst_qmlecmascript::objectPropertiesTriggerReeval()
 {
     QmlContext context(engine.rootContext());
     MyQmlObject object1;
@@ -336,7 +345,7 @@ void tst_qmlbindengine::objectPropertiesTriggerReeval()
     }
 }
 
-void tst_qmlbindengine::deferredProperties()
+void tst_qmlecmascript::deferredProperties()
 {
     QmlComponent component(&engine, TEST_FILE("deferredProperties.qml"));
     MyDeferredObject *object = 
@@ -353,7 +362,7 @@ void tst_qmlbindengine::deferredProperties()
     QVERIFY(qmlObject != 0);
 }
 
-void tst_qmlbindengine::extensionObjects()
+void tst_qmlecmascript::extensionObjects()
 {
     QmlComponent component(&engine, TEST_FILE("extensionObjects.qml"));
     MyExtendedObject *object = 
@@ -368,8 +377,10 @@ void tst_qmlbindengine::extensionObjects()
     QCOMPARE(object->baseProperty(), 92);
 }
 
-void tst_qmlbindengine::enums()
+void tst_qmlecmascript::enums()
 {
+    // Existant enums
+    {
     QmlComponent component(&engine, TEST_FILE("enums.1.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -384,9 +395,18 @@ void tst_qmlbindengine::enums()
     QCOMPARE(object->property("h").toInt(), 3);
     QCOMPARE(object->property("i").toInt(), 19);
     QCOMPARE(object->property("j").toInt(), 19);
+    }
+    // Non-existant enums
+    {
+    QmlComponent component(&engine, TEST_FILE("enums.2.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("a").toInt(), 0);
+    QCOMPARE(object->property("b").toInt(), 0);
+    }
 }
 
-void tst_qmlbindengine::valueTypeFunctions()
+void tst_qmlecmascript::valueTypeFunctions()
 {
     QmlComponent component(&engine, TEST_FILE("valueTypeFunctions.qml"));
     MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create());
@@ -395,7 +415,97 @@ void tst_qmlbindengine::valueTypeFunctions()
     QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5));
 }
 
+/* 
+Tests that writing a constant to a property with a binding on it disables the
+binding.
+*/
+void tst_qmlecmascript::constantsOverrideBindings()
+{
+    // From ECMAScript
+    {
+        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c2").toInt(), 0);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c2").toInt(), 9);
+
+        emit object->basicSignal();
+
+        QCOMPARE(object->property("c2").toInt(), 13);
+        object->setProperty("c1", QVariant(8));
+        QCOMPARE(object->property("c2").toInt(), 13);
+    }
+
+    // During construction
+    {
+        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c1").toInt(), 0);
+        QCOMPARE(object->property("c2").toInt(), 10);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c1").toInt(), 9);
+        QCOMPARE(object->property("c2").toInt(), 10);
+    }
+
+    // From C++
+    {
+        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c2").toInt(), 0);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c2").toInt(), 9);
+
+        object->setProperty("c2", QVariant(13));
+        QCOMPARE(object->property("c2").toInt(), 13);
+        object->setProperty("c1", QVariant(7));
+        QCOMPARE(object->property("c1").toInt(), 7);
+        QCOMPARE(object->property("c2").toInt(), 13);
+    }
+}
+
+/*
+Tests that assigning a binding to a property that already has a binding causes
+the original binding to be disabled.
+*/
+void tst_qmlecmascript::outerBindingOverridesInnerBinding()
+{
+    QmlComponent component(&engine, TEST_FILE("outerBindingOverridesInnerBinding.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("c1").toInt(), 0);
+    QCOMPARE(object->property("c2").toInt(), 0);
+    QCOMPARE(object->property("c3").toInt(), 0);
+
+    object->setProperty("c1", QVariant(9));
+    QCOMPARE(object->property("c1").toInt(), 9);
+    QCOMPARE(object->property("c2").toInt(), 0);
+    QCOMPARE(object->property("c3").toInt(), 0);
+
+    object->setProperty("c3", QVariant(8));
+    QCOMPARE(object->property("c1").toInt(), 9);
+    QCOMPARE(object->property("c2").toInt(), 8);
+    QCOMPARE(object->property("c3").toInt(), 8);
+}
+
+/*
+Access a non-existant attached object.  
+
+Tests for a regression where this used to crash.
+*/
+void tst_qmlecmascript::nonExistantAttachedObject()
+{
+    QmlComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
 
-QTEST_MAIN(tst_qmlbindengine)
+QTEST_MAIN(tst_qmlecmascript)
 
-#include "tst_qmlbindengine.moc"
+#include "tst_qmlecmascript.moc"
diff --git a/tests/auto/declarative/qmlparser/data/Alias.qml b/tests/auto/declarative/qmllanguage/data/Alias.qml
index 8264e0d..8264e0d 100644
--- a/tests/auto/declarative/qmlparser/data/Alias.qml
+++ b/tests/auto/declarative/qmllanguage/data/Alias.qml
diff --git a/tests/auto/declarative/qmlparser/data/MyComponent.qml b/tests/auto/declarative/qmllanguage/data/MyComponent.qml
index 1a23277..1a23277 100644
--- a/tests/auto/declarative/qmlparser/data/MyComponent.qml
+++ b/tests/auto/declarative/qmllanguage/data/MyComponent.qml
diff --git a/tests/auto/declarative/qmlparser/data/MyContainerComponent.qml b/tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml
index 61f54c5..61f54c5 100644
--- a/tests/auto/declarative/qmlparser/data/MyContainerComponent.qml
+++ b/tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml
diff --git a/tests/auto/declarative/qmlparser/data/alias.1.qml b/tests/auto/declarative/qmllanguage/data/alias.1.qml
index 492d99a..492d99a 100644
--- a/tests/auto/declarative/qmlparser/data/alias.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.1.qml
diff --git a/tests/auto/declarative/qmlparser/data/alias.2.qml b/tests/auto/declarative/qmllanguage/data/alias.2.qml
index aa4d103..aa4d103 100644
--- a/tests/auto/declarative/qmlparser/data/alias.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.2.qml
diff --git a/tests/auto/declarative/qmlparser/data/alias.3.qml b/tests/auto/declarative/qmllanguage/data/alias.3.qml
index e25fbae..e25fbae 100644
--- a/tests/auto/declarative/qmlparser/data/alias.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.3.qml
diff --git a/tests/auto/declarative/qmlparser/data/assignBasicTypes.qml b/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml
index cef9f8d..cef9f8d 100644
--- a/tests/auto/declarative/qmlparser/data/assignBasicTypes.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml
diff --git a/tests/auto/declarative/qmlparser/data/assignLiteralSignalProperty.qml b/tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml
index 399fcea..399fcea 100644
--- a/tests/auto/declarative/qmlparser/data/assignLiteralSignalProperty.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml
diff --git a/tests/auto/declarative/qmlparser/data/assignObjectToSignal.qml b/tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml
index 789cc66..789cc66 100644
--- a/tests/auto/declarative/qmlparser/data/assignObjectToSignal.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml
diff --git a/tests/auto/declarative/qmlparser/data/assignObjectToVariant.qml b/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
index 28c68c4..28c68c4 100644
--- a/tests/auto/declarative/qmlparser/data/assignObjectToVariant.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
diff --git a/tests/auto/declarative/qmlparser/data/assignQmlComponent.qml b/tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml
index 20bdc55..20bdc55 100644
--- a/tests/auto/declarative/qmlparser/data/assignQmlComponent.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml
diff --git a/tests/auto/declarative/qmlparser/data/assignSignal.qml b/tests/auto/declarative/qmllanguage/data/assignSignal.qml
index 3abc04d..3abc04d 100644
--- a/tests/auto/declarative/qmlparser/data/assignSignal.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignSignal.qml
diff --git a/tests/auto/declarative/qmlparser/data/assignTypeExtremes.qml b/tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml
index 60ede52..60ede52 100644
--- a/tests/auto/declarative/qmlparser/data/assignTypeExtremes.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml
diff --git a/tests/auto/declarative/qmlparser/data/attachedProperties.qml b/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
index 8343754..8343754 100644
--- a/tests/auto/declarative/qmlparser/data/attachedProperties.qml
+++ b/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
diff --git a/tests/auto/declarative/qmlparser/data/autoComponentCreation.qml b/tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml
index 5d00144..5d00144 100644
--- a/tests/auto/declarative/qmlparser/data/autoComponentCreation.qml
+++ b/tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml
diff --git a/tests/auto/declarative/qmlparser/data/cppnamespace.qml b/tests/auto/declarative/qmllanguage/data/cppnamespace.qml
index e1daf3b..e1daf3b 100644
--- a/tests/auto/declarative/qmlparser/data/cppnamespace.qml
+++ b/tests/auto/declarative/qmllanguage/data/cppnamespace.qml
diff --git a/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.errors.txt b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt
index d28c0bd..d28c0bd 100644
--- a/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml
index e607768..e607768 100644
--- a/tests/auto/declarative/qmlparser/data/customParserIdNotAllowed.qml
+++ b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml
diff --git a/tests/auto/declarative/qmlparser/data/customParserTypes.qml b/tests/auto/declarative/qmllanguage/data/customParserTypes.qml
index cf2f272..cf2f272 100644
--- a/tests/auto/declarative/qmlparser/data/customParserTypes.qml
+++ b/tests/auto/declarative/qmllanguage/data/customParserTypes.qml
diff --git a/tests/auto/declarative/qmlparser/data/customVariantTypes.qml b/tests/auto/declarative/qmllanguage/data/customVariantTypes.qml
index 0263ed2..0263ed2 100644
--- a/tests/auto/declarative/qmlparser/data/customVariantTypes.qml
+++ b/tests/auto/declarative/qmllanguage/data/customVariantTypes.qml
diff --git a/tests/auto/declarative/qmlparser/data/duplicateIDs.errors.txt b/tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt
index 66241cf..66241cf 100644
--- a/tests/auto/declarative/qmlparser/data/duplicateIDs.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/duplicateIDs.qml b/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml
index 9605b5b..9605b5b 100644
--- a/tests/auto/declarative/qmlparser/data/duplicateIDs.qml
+++ b/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml
diff --git a/tests/auto/declarative/qmlparser/data/dynamicObject.1.qml b/tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml
index 85d1052..85d1052 100644
--- a/tests/auto/declarative/qmlparser/data/dynamicObject.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml
diff --git a/tests/auto/declarative/qmlparser/data/dynamicProperties.qml b/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
index f93e446..f93e446 100644
--- a/tests/auto/declarative/qmlparser/data/dynamicProperties.qml
+++ b/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
diff --git a/tests/auto/declarative/qmlparser/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
index b0ca970..b0ca970 100644
--- a/tests/auto/declarative/qmlparser/data/dynamicSignalsAndSlots.qml
+++ b/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
diff --git a/tests/auto/declarative/qmlparser/data/empty.errors.txt b/tests/auto/declarative/qmllanguage/data/empty.errors.txt
index d416e76..d416e76 100644
--- a/tests/auto/declarative/qmlparser/data/empty.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/empty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/empty.qml b/tests/auto/declarative/qmllanguage/data/empty.qml
index e69de29..e69de29 100644
--- a/tests/auto/declarative/qmlparser/data/empty.qml
+++ b/tests/auto/declarative/qmllanguage/data/empty.qml
diff --git a/tests/auto/declarative/qmlparser/data/failingComponent.errors.txt b/tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt
index 0cf0ef3..0cf0ef3 100644
--- a/tests/auto/declarative/qmlparser/data/failingComponent.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/failingComponentTest.qml b/tests/auto/declarative/qmllanguage/data/failingComponentTest.qml
index 74a6acf..74a6acf 100644
--- a/tests/auto/declarative/qmlparser/data/failingComponentTest.qml
+++ b/tests/auto/declarative/qmllanguage/data/failingComponentTest.qml
diff --git a/tests/auto/declarative/qmlparser/data/fakeDotProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt
index e56ad3a..e56ad3a 100644
--- a/tests/auto/declarative/qmlparser/data/fakeDotProperty.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/fakeDotProperty.qml b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml
index d971eee..d971eee 100644
--- a/tests/auto/declarative/qmlparser/data/fakeDotProperty.qml
+++ b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml
diff --git a/tests/auto/declarative/qmlparser/data/finalOverride.errors.txt b/tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt
index 49e06cb..49e06cb 100644
--- a/tests/auto/declarative/qmlparser/data/finalOverride.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/finalOverride.qml b/tests/auto/declarative/qmllanguage/data/finalOverride.qml
index a84393a..a84393a 100644
--- a/tests/auto/declarative/qmlparser/data/finalOverride.qml
+++ b/tests/auto/declarative/qmllanguage/data/finalOverride.qml
diff --git a/tests/auto/declarative/qmlparser/data/idProperty.qml b/tests/auto/declarative/qmllanguage/data/idProperty.qml
index a413c0b..a413c0b 100644
--- a/tests/auto/declarative/qmlparser/data/idProperty.qml
+++ b/tests/auto/declarative/qmllanguage/data/idProperty.qml
diff --git a/tests/auto/declarative/qmlparser/data/importNamespaceConflict.errors.txt b/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt
index 231998d..231998d 100644
--- a/tests/auto/declarative/qmlparser/data/importNamespaceConflict.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/importNamespaceConflict.qml b/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml
index cd112af..cd112af 100644
--- a/tests/auto/declarative/qmlparser/data/importNamespaceConflict.qml
+++ b/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml
diff --git a/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.errors.txt b/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt
index 2235cbc..2235cbc 100644
--- a/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.qml b/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml
index 23ed566..23ed566 100644
--- a/tests/auto/declarative/qmlparser/data/importVersionMissingBuiltIn.qml
+++ b/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml
diff --git a/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt
index 2235cbc..2235cbc 100644
--- a/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.qml b/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml
index 97ec222..97ec222 100644
--- a/tests/auto/declarative/qmlparser/data/importVersionMissingInstalled.qml
+++ b/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml
diff --git a/tests/auto/declarative/qmlparser/data/inlineQmlComponents.qml b/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml
index 79ceda6..79ceda6 100644
--- a/tests/auto/declarative/qmlparser/data/inlineQmlComponents.qml
+++ b/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml
diff --git a/tests/auto/declarative/qmlparser/data/interfaceProperty.qml b/tests/auto/declarative/qmllanguage/data/interfaceProperty.qml
index 70879ff..70879ff 100644
--- a/tests/auto/declarative/qmlparser/data/interfaceProperty.qml
+++ b/tests/auto/declarative/qmllanguage/data/interfaceProperty.qml
diff --git a/tests/auto/declarative/qmlparser/data/interfaceQList.qml b/tests/auto/declarative/qmllanguage/data/interfaceQList.qml
index c87dfae..c87dfae 100644
--- a/tests/auto/declarative/qmlparser/data/interfaceQList.qml
+++ b/tests/auto/declarative/qmllanguage/data/interfaceQList.qml
diff --git a/tests/auto/declarative/qmlparser/data/interfaceQmlList.qml b/tests/auto/declarative/qmllanguage/data/interfaceQmlList.qml
index 8392bea..8392bea 100644
--- a/tests/auto/declarative/qmlparser/data/interfaceQmlList.qml
+++ b/tests/auto/declarative/qmllanguage/data/interfaceQmlList.qml
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.2.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt
index 56e3eeb..56e3eeb 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.2.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.2.qml b/tests/auto/declarative/qmllanguage/data/invalidID.2.qml
index 4fb3b29..4fb3b29 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.2.qml
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.3.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt
index bb811cf..bb811cf 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.3.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.3.qml b/tests/auto/declarative/qmllanguage/data/invalidID.3.qml
index 6684172..6684172 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.3.qml
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.4.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt
index cfe8756..cfe8756 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.4.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.4.qml b/tests/auto/declarative/qmllanguage/data/invalidID.4.qml
index 1f15fce..1f15fce 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.4.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.4.qml
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.5.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt
index b0a63a0..b0a63a0 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.5.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.5.qml b/tests/auto/declarative/qmllanguage/data/invalidID.5.qml
index 0545b0d..0545b0d 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.5.qml
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.6.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt
index 861e3d7..861e3d7 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.6.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.6.qml b/tests/auto/declarative/qmllanguage/data/invalidID.6.qml
index ea34007..ea34007 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.6.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.6.qml
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.errors.txt
index 1ca678c..1ca678c 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/invalidID.qml b/tests/auto/declarative/qmllanguage/data/invalidID.qml
index 04db3eb..04db3eb 100644
--- a/tests/auto/declarative/qmlparser/data/invalidID.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidID.qml
diff --git a/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
index d8a22a8..d8a22a8 100644
--- a/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
diff --git a/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
index a0706ad..a0706ad 100644
--- a/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/InstalledTest2.qml
+++ b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
diff --git a/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir
index ba0b42a..ba0b42a 100644
--- a/tests/auto/declarative/qmlparser/data/lib/com/nokia/installedtest/qmldir
+++ b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir
diff --git a/tests/auto/declarative/qmlparser/data/listAssignment.1.errors.txt b/tests/auto/declarative/qmllanguage/data/listAssignment.1.errors.txt
index d68d487..d68d487 100644
--- a/tests/auto/declarative/qmlparser/data/listAssignment.1.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/listAssignment.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/listAssignment.1.qml b/tests/auto/declarative/qmllanguage/data/listAssignment.1.qml
index 4240425..4240425 100644
--- a/tests/auto/declarative/qmlparser/data/listAssignment.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/listAssignment.1.qml
diff --git a/tests/auto/declarative/qmlparser/data/listAssignment.2.errors.txt b/tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt
index 8b40aa3..8b40aa3 100644
--- a/tests/auto/declarative/qmlparser/data/listAssignment.2.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/listAssignment.2.qml b/tests/auto/declarative/qmllanguage/data/listAssignment.2.qml
index e3baadb..e3baadb 100644
--- a/tests/auto/declarative/qmlparser/data/listAssignment.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/listAssignment.2.qml
diff --git a/tests/auto/declarative/qmlparser/data/listAssignment.3.errors.txt b/tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt
index 8c7b7e9..8c7b7e9 100644
--- a/tests/auto/declarative/qmlparser/data/listAssignment.3.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/listAssignment.3.qml b/tests/auto/declarative/qmllanguage/data/listAssignment.3.qml
index 00c4c6b..00c4c6b 100644
--- a/tests/auto/declarative/qmlparser/data/listAssignment.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/listAssignment.3.qml
diff --git a/tests/auto/declarative/qmlparser/data/listItemDeleteSelf.qml b/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml
index fa2e831..fa2e831 100644
--- a/tests/auto/declarative/qmlparser/data/listItemDeleteSelf.qml
+++ b/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml
diff --git a/tests/auto/declarative/qmlparser/data/missingObject.errors.txt b/tests/auto/declarative/qmllanguage/data/missingObject.errors.txt
index b31b562..b31b562 100644
--- a/tests/auto/declarative/qmlparser/data/missingObject.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/missingObject.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/missingObject.qml b/tests/auto/declarative/qmllanguage/data/missingObject.qml
index 2f17045..2f17045 100644
--- a/tests/auto/declarative/qmlparser/data/missingObject.qml
+++ b/tests/auto/declarative/qmllanguage/data/missingObject.qml
diff --git a/tests/auto/declarative/qmlparser/data/missingSignal.errors.txt b/tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt
index e243ae5..e243ae5 100644
--- a/tests/auto/declarative/qmlparser/data/missingSignal.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/missingSignal.qml b/tests/auto/declarative/qmllanguage/data/missingSignal.qml
index fd489ca..fd489ca 100644
--- a/tests/auto/declarative/qmlparser/data/missingSignal.qml
+++ b/tests/auto/declarative/qmllanguage/data/missingSignal.qml
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt
index cfc6fc8..cfc6fc8 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml
index df7406c..df7406c 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt
index 8b13585..8b13585 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml
index 06ccd37..06ccd37 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt
index 8b13585..8b13585 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml
index 5b08608..5b08608 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt
index 8b13585..8b13585 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml
index 6579191..6579191 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.4.qml
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt
index c07f2b9..c07f2b9 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml
index 37af057..37af057 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt
index c02d7bd..c02d7bd 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml
index 5cd55d0..5cd55d0 100644
--- a/tests/auto/declarative/qmlparser/data/nonexistantProperty.6.qml
+++ b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml
diff --git a/tests/auto/declarative/qmlparser/data/nullDotProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt
index 07a4094..07a4094 100644
--- a/tests/auto/declarative/qmlparser/data/nullDotProperty.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/nullDotProperty.qml b/tests/auto/declarative/qmllanguage/data/nullDotProperty.qml
index 4e36779..4e36779 100644
--- a/tests/auto/declarative/qmlparser/data/nullDotProperty.qml
+++ b/tests/auto/declarative/qmllanguage/data/nullDotProperty.qml
diff --git a/tests/auto/declarative/qmlparser/data/propertyValueSource.qml b/tests/auto/declarative/qmllanguage/data/propertyValueSource.qml
index ad71fcf..ad71fcf 100644
--- a/tests/auto/declarative/qmlparser/data/propertyValueSource.qml
+++ b/tests/auto/declarative/qmllanguage/data/propertyValueSource.qml
diff --git a/tests/auto/declarative/qmlparser/data/readOnly.1.errors.txt b/tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt
index b8c3404..b8c3404 100644
--- a/tests/auto/declarative/qmlparser/data/readOnly.1.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/readOnly.1.qml b/tests/auto/declarative/qmllanguage/data/readOnly.1.qml
index 60757bd..60757bd 100644
--- a/tests/auto/declarative/qmlparser/data/readOnly.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/readOnly.1.qml
diff --git a/tests/auto/declarative/qmlparser/data/readOnly.2.errors.txt b/tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt
index d857a04..d857a04 100644
--- a/tests/auto/declarative/qmlparser/data/readOnly.2.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/readOnly.2.qml b/tests/auto/declarative/qmllanguage/data/readOnly.2.qml
index 8f1633c..8f1633c 100644
--- a/tests/auto/declarative/qmlparser/data/readOnly.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/readOnly.2.qml
diff --git a/tests/auto/declarative/qmlparser/data/rootAsQmlComponent.qml b/tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml
index 8d72cd3..8d72cd3 100644
--- a/tests/auto/declarative/qmlparser/data/rootAsQmlComponent.qml
+++ b/tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml
diff --git a/tests/auto/declarative/qmlparser/data/simpleBindings.qml b/tests/auto/declarative/qmllanguage/data/simpleBindings.qml
index 74867b3..74867b3 100644
--- a/tests/auto/declarative/qmlparser/data/simpleBindings.qml
+++ b/tests/auto/declarative/qmllanguage/data/simpleBindings.qml
diff --git a/tests/auto/declarative/qmlparser/data/simpleContainer.qml b/tests/auto/declarative/qmllanguage/data/simpleContainer.qml
index c3a795f..c3a795f 100644
--- a/tests/auto/declarative/qmlparser/data/simpleContainer.qml
+++ b/tests/auto/declarative/qmllanguage/data/simpleContainer.qml
diff --git a/tests/auto/declarative/qmlparser/data/simpleObject.qml b/tests/auto/declarative/qmllanguage/data/simpleObject.qml
index 30c7823..30c7823 100644
--- a/tests/auto/declarative/qmlparser/data/simpleObject.qml
+++ b/tests/auto/declarative/qmllanguage/data/simpleObject.qml
diff --git a/tests/auto/declarative/qmlparser/data/subdir/Test.qml b/tests/auto/declarative/qmllanguage/data/subdir/Test.qml
index c4d5905..c4d5905 100644
--- a/tests/auto/declarative/qmlparser/data/subdir/Test.qml
+++ b/tests/auto/declarative/qmllanguage/data/subdir/Test.qml
diff --git a/tests/auto/declarative/qmlparser/data/unregisteredObject.errors.txt b/tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt
index bc4f7f4..bc4f7f4 100644
--- a/tests/auto/declarative/qmlparser/data/unregisteredObject.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/unregisteredObject.qml b/tests/auto/declarative/qmllanguage/data/unregisteredObject.qml
index 9498e31..9498e31 100644
--- a/tests/auto/declarative/qmlparser/data/unregisteredObject.qml
+++ b/tests/auto/declarative/qmllanguage/data/unregisteredObject.qml
diff --git a/tests/auto/declarative/qmlparser/data/unsupportedProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt
index 3a90a7d..3a90a7d 100644
--- a/tests/auto/declarative/qmlparser/data/unsupportedProperty.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/unsupportedProperty.qml b/tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml
index 9f19680..9f19680 100644
--- a/tests/auto/declarative/qmlparser/data/unsupportedProperty.qml
+++ b/tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml
diff --git a/tests/auto/declarative/qmlparser/data/valueTypes.qml b/tests/auto/declarative/qmllanguage/data/valueTypes.qml
index bf325a7..bf325a7 100644
--- a/tests/auto/declarative/qmlparser/data/valueTypes.qml
+++ b/tests/auto/declarative/qmllanguage/data/valueTypes.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.1.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt
index ba7a076..ba7a076 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.1.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.1.qml b/tests/auto/declarative/qmllanguage/data/wrongType.1.qml
index 289d37f..289d37f 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.1.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.10.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt
index ae75b52..ae75b52 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.10.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.10.qml b/tests/auto/declarative/qmllanguage/data/wrongType.10.qml
index 2cf0e50..2cf0e50 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.10.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.10.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.11.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt
index 23a4cda..23a4cda 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.11.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.11.qml b/tests/auto/declarative/qmllanguage/data/wrongType.11.qml
index ae77ba1..ae77ba1 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.11.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.11.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.12.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt
index 3092100..3092100 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.12.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.12.qml b/tests/auto/declarative/qmllanguage/data/wrongType.12.qml
index b7a366f..b7a366f 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.12.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.12.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.13.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt
index ba7a076..ba7a076 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.13.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.13.qml b/tests/auto/declarative/qmllanguage/data/wrongType.13.qml
index 477aff1..477aff1 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.13.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.13.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.14.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt
index d621fdd..d621fdd 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.14.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.14.qml b/tests/auto/declarative/qmllanguage/data/wrongType.14.qml
index 672d693..672d693 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.14.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.14.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.2.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt
index 9ff9f25..9ff9f25 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.2.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.2.qml b/tests/auto/declarative/qmllanguage/data/wrongType.2.qml
index 34b74f7..34b74f7 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.2.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.3.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt
index 6d971c6..6d971c6 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.3.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.3.qml b/tests/auto/declarative/qmllanguage/data/wrongType.3.qml
index 384181a..384181a 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.3.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.4.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt
index ef34d0e..ef34d0e 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.4.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.4.qml b/tests/auto/declarative/qmllanguage/data/wrongType.4.qml
index 0787bf5..0787bf5 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.4.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.4.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.5.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt
index cab10bd..cab10bd 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.5.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.5.qml b/tests/auto/declarative/qmllanguage/data/wrongType.5.qml
index c50ae9a..c50ae9a 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.5.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.6.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt
index d0a0b00..d0a0b00 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.6.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.6.qml b/tests/auto/declarative/qmllanguage/data/wrongType.6.qml
index da10b78..da10b78 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.6.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.6.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.7.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt
index 614346b..614346b 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.7.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.7.qml b/tests/auto/declarative/qmllanguage/data/wrongType.7.qml
index ddc3835..ddc3835 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.7.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.7.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.8.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt
index 1773c00..1773c00 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.8.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.8.qml b/tests/auto/declarative/qmllanguage/data/wrongType.8.qml
index a5f6756..a5f6756 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.8.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.8.qml
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.9.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt
index 8630975..8630975 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.9.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt
diff --git a/tests/auto/declarative/qmlparser/data/wrongType.9.qml b/tests/auto/declarative/qmllanguage/data/wrongType.9.qml
index a3db732..a3db732 100644
--- a/tests/auto/declarative/qmlparser/data/wrongType.9.qml
+++ b/tests/auto/declarative/qmllanguage/data/wrongType.9.qml
diff --git a/tests/auto/declarative/qmlparser/qmlparser.pro b/tests/auto/declarative/qmllanguage/qmllanguage.pro
index dda5c61..4e4be9c 100644
--- a/tests/auto/declarative/qmlparser/qmlparser.pro
+++ b/tests/auto/declarative/qmllanguage/qmllanguage.pro
@@ -1,8 +1,8 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlparser.cpp \
+SOURCES += tst_qmllanguage.cpp \
            testtypes.cpp
-HEADERS = testtypes.h
+HEADERS += testtypes.h
 macx:CONFIG -= app_bundle
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
diff --git a/tests/auto/declarative/qmlparser/testtypes.cpp b/tests/auto/declarative/qmllanguage/testtypes.cpp
index c11e195..c11e195 100644
--- a/tests/auto/declarative/qmlparser/testtypes.cpp
+++ b/tests/auto/declarative/qmllanguage/testtypes.cpp
diff --git a/tests/auto/declarative/qmlparser/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h
index f6f966f..b1da9fb 100644
--- a/tests/auto/declarative/qmlparser/testtypes.h
+++ b/tests/auto/declarative/qmllanguage/testtypes.h
@@ -104,7 +104,7 @@ signals:
     void basicParameterizedSignal(int parameter);
 
 private:
-    friend class tst_qmlparser;
+    friend class tst_qmllanguage;
     int m_value;
     MyInterface *m_interface;
     MyQmlObject *m_qmlobject;
diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
index 7f51639..1bf98df 100644
--- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
+++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
@@ -7,11 +7,17 @@
 #include <QtCore/qdir.h>
 #include "testtypes.h"
 
-class tst_qmlparser : public QObject
+/*
+This test case covers QML language issues.  This covers everything that does 
+involve evaluating ECMAScript expressions and bindings.
+
+Evaluation of expressions and bindings is covered in qmlecmascript
+*/
+class tst_qmllanguage : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlparser() {
+    tst_qmllanguage() {
         QmlMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter);
         QFileInfo fileInfo(__FILE__);
         engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("data/lib")));
@@ -104,7 +110,7 @@ inline QUrl TEST_FILE(const char *filename)
     return TEST_FILE(QLatin1String(filename));
 }
 
-void tst_qmlparser::errors_data()
+void tst_qmllanguage::errors_data()
 {
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("errorFile");
@@ -166,7 +172,7 @@ void tst_qmlparser::errors_data()
     QTest::newRow("customParserIdNotAllowed") << "customParserIdNotAllowed.qml" << "customParserIdNotAllowed.errors.txt" << false;
 }
 
-void tst_qmlparser::errors()
+void tst_qmllanguage::errors()
 {
     QFETCH(QString, file);
     QFETCH(QString, errorFile);
@@ -182,7 +188,7 @@ void tst_qmlparser::errors()
     VERIFY_ERRORS(errorFile.toLatin1().constData());
 }
 
-void tst_qmlparser::simpleObject()
+void tst_qmllanguage::simpleObject()
 {
     QmlComponent component(&engine, TEST_FILE("simpleObject.qml"));
     VERIFY_ERRORS(0);
@@ -190,7 +196,7 @@ void tst_qmlparser::simpleObject()
     QVERIFY(object != 0);
 }
 
-void tst_qmlparser::simpleContainer()
+void tst_qmllanguage::simpleContainer()
 {
     QmlComponent component(&engine, TEST_FILE("simpleContainer.qml"));
     VERIFY_ERRORS(0);
@@ -199,7 +205,7 @@ void tst_qmlparser::simpleContainer()
     QCOMPARE(container->children()->count(),2);
 }
 
-void tst_qmlparser::interfaceProperty()
+void tst_qmllanguage::interfaceProperty()
 {
     QmlComponent component(&engine, TEST_FILE("interfaceProperty.qml"));
     VERIFY_ERRORS(0);
@@ -209,7 +215,7 @@ void tst_qmlparser::interfaceProperty()
     QVERIFY(object->interface()->id == 913);
 }
 
-void tst_qmlparser::interfaceQmlList()
+void tst_qmllanguage::interfaceQmlList()
 {
     QmlComponent component(&engine, TEST_FILE("interfaceQmlList.qml"));
     VERIFY_ERRORS(0);
@@ -220,7 +226,7 @@ void tst_qmlparser::interfaceQmlList()
         QVERIFY(container->qmllistAccessor().at(ii)->id == 913);
 }
 
-void tst_qmlparser::interfaceQList()
+void tst_qmllanguage::interfaceQList()
 {
     QmlComponent component(&engine, TEST_FILE("interfaceQList.qml"));
     VERIFY_ERRORS(0);
@@ -231,7 +237,7 @@ void tst_qmlparser::interfaceQList()
         QVERIFY(container->qlistInterfaces()->at(ii)->id == 913);
 }
 
-void tst_qmlparser::assignObjectToSignal()
+void tst_qmllanguage::assignObjectToSignal()
 {
     QmlComponent component(&engine, TEST_FILE("assignObjectToSignal.qml"));
     VERIFY_ERRORS(0);
@@ -241,7 +247,7 @@ void tst_qmlparser::assignObjectToSignal()
     emit object->basicSignal();
 }
 
-void tst_qmlparser::assignObjectToVariant()
+void tst_qmllanguage::assignObjectToVariant()
 {
     QmlComponent component(&engine, TEST_FILE("assignObjectToVariant.qml"));
     VERIFY_ERRORS(0);
@@ -251,7 +257,7 @@ void tst_qmlparser::assignObjectToVariant()
     QVERIFY(v.userType() == qMetaTypeId<QObject *>());
 }
 
-void tst_qmlparser::assignLiteralSignalProperty()
+void tst_qmllanguage::assignLiteralSignalProperty()
 {
     QmlComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.qml"));
     VERIFY_ERRORS(0);
@@ -261,7 +267,7 @@ void tst_qmlparser::assignLiteralSignalProperty()
 }
 
 // Test is an external component can be loaded and assigned (to a qlist)
-void tst_qmlparser::assignQmlComponent()
+void tst_qmllanguage::assignQmlComponent()
 {
     QmlComponent component(&engine, TEST_FILE("assignQmlComponent.qml"));
     VERIFY_ERRORS(0);
@@ -274,7 +280,7 @@ void tst_qmlparser::assignQmlComponent()
 }
 
 // Test literal assignment to all the basic types 
-void tst_qmlparser::assignBasicTypes()
+void tst_qmllanguage::assignBasicTypes()
 {
     QmlComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
     VERIFY_ERRORS(0);
@@ -306,7 +312,7 @@ void tst_qmlparser::assignBasicTypes()
 }
 
 // Test edge case type assignments
-void tst_qmlparser::assignTypeExtremes()
+void tst_qmllanguage::assignTypeExtremes()
 {
     QmlComponent component(&engine, TEST_FILE("assignTypeExtremes.qml"));
     VERIFY_ERRORS(0);
@@ -317,7 +323,7 @@ void tst_qmlparser::assignTypeExtremes()
 }
 
 // Tests that custom parser types can be instantiated
-void tst_qmlparser::customParserTypes()
+void tst_qmllanguage::customParserTypes()
 {
     QmlComponent component(&engine, TEST_FILE("customParserTypes.qml"));
     VERIFY_ERRORS(0);
@@ -327,7 +333,7 @@ void tst_qmlparser::customParserTypes()
 }
 
 // Tests that the root item can be a custom component
-void tst_qmlparser::rootAsQmlComponent()
+void tst_qmllanguage::rootAsQmlComponent()
 {
     QmlComponent component(&engine, TEST_FILE("rootAsQmlComponent.qml"));
     VERIFY_ERRORS(0);
@@ -338,7 +344,7 @@ void tst_qmlparser::rootAsQmlComponent()
 }
 
 // Tests that components can be specified inline
-void tst_qmlparser::inlineQmlComponents()
+void tst_qmllanguage::inlineQmlComponents()
 {
     QmlComponent component(&engine, TEST_FILE("inlineQmlComponents.qml"));
     VERIFY_ERRORS(0);
@@ -353,7 +359,7 @@ void tst_qmlparser::inlineQmlComponents()
 }
 
 // Tests that types that have an id property have it set
-void tst_qmlparser::idProperty()
+void tst_qmllanguage::idProperty()
 {
     QmlComponent component(&engine, TEST_FILE("idProperty.qml"));
     VERIFY_ERRORS(0);
@@ -368,7 +374,7 @@ void tst_qmlparser::idProperty()
 }
 
 // Tests that signals can be assigned to
-void tst_qmlparser::assignSignal()
+void tst_qmllanguage::assignSignal()
 {
     QmlComponent component(&engine, TEST_FILE("assignSignal.qml"));
     VERIFY_ERRORS(0);
@@ -381,7 +387,7 @@ void tst_qmlparser::assignSignal()
 }
 
 // Tests the creation and assignment of dynamic properties
-void tst_qmlparser::dynamicProperties()
+void tst_qmllanguage::dynamicProperties()
 {
     QmlComponent component(&engine, TEST_FILE("dynamicProperties.qml"));
     VERIFY_ERRORS(0);
@@ -399,7 +405,7 @@ void tst_qmlparser::dynamicProperties()
 }
 
 // Tests the declaration of dynamic signals and slots
-void tst_qmlparser::dynamicSignalsAndSlots()
+void tst_qmllanguage::dynamicSignalsAndSlots()
 {
     QmlComponent component(&engine, TEST_FILE("dynamicSignalsAndSlots.qml"));
     VERIFY_ERRORS(0);
@@ -411,7 +417,7 @@ void tst_qmlparser::dynamicSignalsAndSlots()
     QVERIFY(object->metaObject()->indexOfMethod("slot2()") != -1);
 }
 
-void tst_qmlparser::simpleBindings()
+void tst_qmllanguage::simpleBindings()
 {
     QmlComponent component(&engine, TEST_FILE("simpleBindings.qml"));
     VERIFY_ERRORS(0);
@@ -424,7 +430,7 @@ void tst_qmlparser::simpleBindings()
     QCOMPARE(object->property("objectProperty"), QVariant::fromValue(object));
 }
 
-void tst_qmlparser::autoComponentCreation()
+void tst_qmllanguage::autoComponentCreation()
 {
     QmlComponent component(&engine, TEST_FILE("autoComponentCreation.qml"));
     VERIFY_ERRORS(0);
@@ -436,7 +442,7 @@ void tst_qmlparser::autoComponentCreation()
     QCOMPARE(child->realProperty(), qreal(9));
 }
 
-void tst_qmlparser::propertyValueSource()
+void tst_qmllanguage::propertyValueSource()
 {
     QmlComponent component(&engine, TEST_FILE("propertyValueSource.qml"));
     VERIFY_ERRORS(0);
@@ -459,7 +465,7 @@ void tst_qmlparser::propertyValueSource()
     QCOMPARE(valueSource->prop.name(), QString(QLatin1String("intProperty")));
 }
 
-void tst_qmlparser::attachedProperties()
+void tst_qmllanguage::attachedProperties()
 {
     QmlComponent component(&engine, TEST_FILE("attachedProperties.qml"));
     VERIFY_ERRORS(0);
@@ -471,7 +477,7 @@ void tst_qmlparser::attachedProperties()
 }
 
 // Tests non-static object properties
-void tst_qmlparser::dynamicObjects()
+void tst_qmllanguage::dynamicObjects()
 {
     QmlComponent component(&engine, TEST_FILE("dynamicObject.1.qml"));
     VERIFY_ERRORS(0);
@@ -480,7 +486,7 @@ void tst_qmlparser::dynamicObjects()
 }
 
 // Tests the registration of custom variant string converters
-void tst_qmlparser::customVariantTypes()
+void tst_qmllanguage::customVariantTypes()
 {
     QmlComponent component(&engine, TEST_FILE("customVariantTypes.qml"));
     VERIFY_ERRORS(0);
@@ -489,7 +495,7 @@ void tst_qmlparser::customVariantTypes()
     QCOMPARE(object->customType().a, 10);
 }
 
-void tst_qmlparser::valueTypes()
+void tst_qmllanguage::valueTypes()
 {
     QmlComponent component(&engine, TEST_FILE("valueTypes.qml"));
     VERIFY_ERRORS(0);
@@ -515,7 +521,7 @@ void tst_qmlparser::valueTypes()
     QCOMPARE(p2.read(), QVariant(13));
 }
 
-void tst_qmlparser::cppnamespace()
+void tst_qmllanguage::cppnamespace()
 {
     QmlComponent component(&engine, TEST_FILE("cppnamespace.qml"));
     VERIFY_ERRORS(0);
@@ -524,7 +530,7 @@ void tst_qmlparser::cppnamespace()
     delete object;
 }
 
-void tst_qmlparser::aliasProperties()
+void tst_qmllanguage::aliasProperties()
 {
     // Simple "int" alias
     {
@@ -607,7 +613,7 @@ public:
 };
 
 // Check that first child of qml is of given type. Empty type insists on error.
-void tst_qmlparser::testType(const QString& qml, const QString& type)
+void tst_qmllanguage::testType(const QString& qml, const QString& type)
 {
     QmlComponent component(&engine, qml.toUtf8(), TEST_FILE("empty.qml")); // just a file for relative local imports
 
@@ -630,7 +636,7 @@ QML_DEFINE_TYPE(com.nokia.Test, 1, 8, 9, Test, TestType2)
 QML_DEFINE_TYPE(com.nokia.Test, 1, 12, 13, Test, TestType2)
 QML_DEFINE_TYPE(com.nokia.Test, 1, 9, 11, OldTest, TestType)
 
-void tst_qmlparser::importsBuiltin_data()
+void tst_qmllanguage::importsBuiltin_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
@@ -726,14 +732,14 @@ void tst_qmlparser::importsBuiltin_data()
         << "";
 }
 
-void tst_qmlparser::importsBuiltin()
+void tst_qmllanguage::importsBuiltin()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
     testType(qml,type);
 }
 
-void tst_qmlparser::importsLocal_data()
+void tst_qmllanguage::importsLocal_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
@@ -758,14 +764,14 @@ void tst_qmlparser::importsLocal_data()
         << "TestType";
 }
 
-void tst_qmlparser::importsLocal()
+void tst_qmllanguage::importsLocal()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
     testType(qml,type);
 }
 
-void tst_qmlparser::importsInstalled_data()
+void tst_qmllanguage::importsInstalled_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
@@ -781,7 +787,7 @@ void tst_qmlparser::importsInstalled_data()
         << "QFxText";
 }
 
-void tst_qmlparser::importsInstalled()
+void tst_qmllanguage::importsInstalled()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
@@ -789,7 +795,7 @@ void tst_qmlparser::importsInstalled()
 }
 
 
-void tst_qmlparser::importsOrder_data()
+void tst_qmllanguage::importsOrder_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
@@ -840,18 +846,18 @@ void tst_qmlparser::importsOrder_data()
         << "QFxImage";
 }
 
-void tst_qmlparser::importsOrder()
+void tst_qmllanguage::importsOrder()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
     testType(qml,type);
 }
 
-void tst_qmlparser::crash1()
+void tst_qmllanguage::crash1()
 {
     QmlComponent component(&engine, "Component {}");
 }
 
-QTEST_MAIN(tst_qmlparser)
+QTEST_MAIN(tst_qmllanguage)
 
-#include "tst_qmlparser.moc"
+#include "tst_qmllanguage.moc"
diff --git a/tests/auto/declarative/repeater/data/repeater.qml b/tests/auto/declarative/repeater/data/repeater.qml
index 57ba9dc..7d83230 100644
--- a/tests/auto/declarative/repeater/data/repeater.qml
+++ b/tests/auto/declarative/repeater/data/repeater.qml
@@ -6,6 +6,9 @@ Rectangle {
     width: 240
     height: 320
     color: "white"
+    Text {
+        text: "Zero"
+    }
     Repeater {
         id: repeater
         objectName: "repeater"
@@ -19,4 +22,7 @@ Rectangle {
             }
         }
     }
+    Text {
+        text: "Last"
+    }
 }
diff --git a/tests/auto/declarative/repeater/repeater.pro b/tests/auto/declarative/repeater/repeater.pro
index 0ecd7ee..1d30b7b 100644
--- a/tests/auto/declarative/repeater/repeater.pro
+++ b/tests/auto/declarative/repeater/repeater.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_repeater.cpp
+macx:CONFIG -= app_bundle
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/repeater/tst_repeater.cpp b/tests/auto/declarative/repeater/tst_repeater.cpp
index 5fce70e..1bb746b 100644
--- a/tests/auto/declarative/repeater/tst_repeater.cpp
+++ b/tests/auto/declarative/repeater/tst_repeater.cpp
@@ -24,6 +24,11 @@ tst_QFxRepeater::tst_QFxRepeater()
 {
 }
 
+/*
+The Repeater element creates children at its own position in its parent's
+stacking order.  In this test we insert a repeater between two other Text
+elements to test this.
+*/
 void tst_QFxRepeater::stringList()
 {
     QmlView *canvas = createView(SRCDIR "/data/repeater.qml");
@@ -46,12 +51,27 @@ void tst_QFxRepeater::stringList()
     QFxItem *container = findItem<QFxItem>(canvas->root(), "container");
     QVERIFY(container != 0);
 
-    QCOMPARE(container->childItems().count(), data.count() + 1);
+    QCOMPARE(container->childItems().count(), data.count() + 3);
+
+    for (int i = 0; i < container->childItems().count(); ++i) {
+
+        if (i == 0) {
+            QFxText *name = qobject_cast<QFxText*>(container->childItems().at(i));
+            QVERIFY(name != 0);
+            QCOMPARE(name->text(), QLatin1String("Zero"));
+        } else if (i == 1) {
+            // The repeater itself
+            continue;
+        } else if (i == container->childItems().count() - 1) {
+            QFxText *name = qobject_cast<QFxText*>(container->childItems().at(i));
+            QVERIFY(name != 0);
+            QCOMPARE(name->text(), QLatin1String("Last"));
+        } else {
+            QFxText *name = qobject_cast<QFxText*>(container->childItems().at(i));
+            QVERIFY(name != 0);
+            QCOMPARE(name->text(), data.at(i-2));
+        }
 
-    for (int i = 1; i < container->childItems().count(); ++i) {
-        QFxText *name = qobject_cast<QFxText*>(container->childItems().at(i));
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), data.at(i-1));
     }
 
     delete canvas;
diff --git a/tests/auto/declarative/sql/sql.pro b/tests/auto/declarative/sql/sql.pro
new file mode 100644
index 0000000..36a867f
--- /dev/null
+++ b/tests/auto/declarative/sql/sql.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_sql.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"