1 files changed, 28 insertions, 17 deletions

diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
index 606d4c6..7ccdd3d 100644
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
@@ -351,7 +351,7 @@ void tst_qmllanguage::simpleContainer()
     VERIFY_ERRORS(0);
     MyContainer *container= qobject_cast<MyContainer*>(component.create());
     QVERIFY(container != 0);
-    QCOMPARE(container->children()->count(),2);
+    QCOMPARE(container->getChildren()->count(),2);
 }
 
 void tst_qmllanguage::interfaceProperty()
@@ -381,9 +381,9 @@ void tst_qmllanguage::interfaceQList()
     VERIFY_ERRORS(0);
     MyContainer *container= qobject_cast<MyContainer*>(component.create());
     QVERIFY(container != 0);
-    QVERIFY(container->qlistInterfaces()->count() == 2);
+    QVERIFY(container->getQListInterfaces()->count() == 2);
     for(int ii = 0; ii < 2; ++ii)
-        QVERIFY(container->qlistInterfaces()->at(ii)->id == 913);
+        QVERIFY(container->getQListInterfaces()->at(ii)->id == 913);
 }
 
 void tst_qmllanguage::assignObjectToSignal()
@@ -422,8 +422,8 @@ void tst_qmllanguage::assignQmlComponent()
     VERIFY_ERRORS(0);
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
-    QVERIFY(object->children()->count() == 1);
-    QObject *child = object->children()->at(0);
+    QVERIFY(object->getChildren()->count() == 1);
+    QObject *child = object->getChildren()->at(0);
     QCOMPARE(child->property("x"), QVariant(10));
     QCOMPARE(child->property("y"), QVariant(11));
 }
@@ -501,7 +501,7 @@ void tst_qmllanguage::rootAsQmlComponent()
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
     QCOMPARE(object->property("x"), QVariant(11));
-    QCOMPARE(object->children()->count(), 2);
+    QCOMPARE(object->getChildren()->count(), 2);
 }
 
 // Tests that components can be specified inline
@@ -511,8 +511,8 @@ void tst_qmllanguage::inlineQmlComponents()
     VERIFY_ERRORS(0);
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
-    QCOMPARE(object->children()->count(), 1);
-    QmlComponent *comp = qobject_cast<QmlComponent *>(object->children()->at(0));
+    QCOMPARE(object->getChildren()->count(), 1);
+    QmlComponent *comp = qobject_cast<QmlComponent *>(object->getChildren()->at(0));
     QVERIFY(comp != 0);
     MyQmlObject *compObject = qobject_cast<MyQmlObject *>(comp->create());
     QVERIFY(compObject != 0);
@@ -526,9 +526,9 @@ void tst_qmllanguage::idProperty()
     VERIFY_ERRORS(0);
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
-    QCOMPARE(object->children()->count(), 1);
+    QCOMPARE(object->getChildren()->count(), 1);
     MyTypeObject *child = 
-        qobject_cast<MyTypeObject *>(object->children()->at(0));
+        qobject_cast<MyTypeObject *>(object->getChildren()->at(0));
     QVERIFY(child != 0);
     QCOMPARE(child->id(), QString("myObjectId"));
     QCOMPARE(object->property("object"), QVariant::fromValue((QObject *)child));
@@ -1031,13 +1031,13 @@ void tst_qmllanguage::defaultPropertyListOrder()
     MyContainer *container = qobject_cast<MyContainer *>(component.create());
     QVERIFY(container  != 0);
 
-    QCOMPARE(container->children()->count(), 6);
-    QCOMPARE(container->children()->at(0)->property("index"), QVariant(0));
-    QCOMPARE(container->children()->at(1)->property("index"), QVariant(1));
-    QCOMPARE(container->children()->at(2)->property("index"), QVariant(2));
-    QCOMPARE(container->children()->at(3)->property("index"), QVariant(3));
-    QCOMPARE(container->children()->at(4)->property("index"), QVariant(4));
-    QCOMPARE(container->children()->at(5)->property("index"), QVariant(5));
+    QCOMPARE(container->getChildren()->count(), 6);
+    QCOMPARE(container->getChildren()->at(0)->property("index"), QVariant(0));
+    QCOMPARE(container->getChildren()->at(1)->property("index"), QVariant(1));
+    QCOMPARE(container->getChildren()->at(2)->property("index"), QVariant(2));
+    QCOMPARE(container->getChildren()->at(3)->property("index"), QVariant(3));
+    QCOMPARE(container->getChildren()->at(4)->property("index"), QVariant(4));
+    QCOMPARE(container->getChildren()->at(5)->property("index"), QVariant(5));
 }
 
 void tst_qmllanguage::declaredPropertyValues()
@@ -1187,6 +1187,17 @@ void tst_qmllanguage::importsLocal_data()
         << "import Qt 4.6\nimport \"subdir\"\n"
            "Test {}"
         << "QmlGraphicsRectangle";
+    QTest::newRow("local import subsubdir")
+        << "import Qt 4.6\nimport \"subdir/subsubdir\"\n"
+           "SubTest {}"
+        << "QmlGraphicsRectangle";
+    QTest::newRow("local import QTBUG-7721 A")
+        << "subdir.Test {}" // no longer allowed (QTBUG-7721)
+        << "";
+    QTest::newRow("local import QTBUG-7721 B")
+        << "import \"subdir\" as X\n"
+           "X.subsubdir.SubTest {}" // no longer allowed (QTBUG-7721)
+        << "";
     QTest::newRow("local import as")
         << "import \"subdir\" as T\n"
            "T.Test {}"