Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.

The import order has changed, so test files that mirror element names
needed to be renamed (or they would resolve as the type).

4 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid.qml b/tests/auto/declarative/qdeclarativepositioners/data/gridtest.qml
index 830df6a..830df6a 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/grid.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/gridtest.qml
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml b/tests/auto/declarative/qdeclarativepositioners/data/propertychangestest.qml
index 4370a18..4370a18 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/propertychangestest.qml
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/repeater.qml b/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
index 2bc5e94..2bc5e94 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/repeater.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index d23d74c..0e1fee2 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -239,7 +239,7 @@ void tst_QDeclarativePositioners::test_vertical_animated()
 
 void tst_QDeclarativePositioners::test_grid()
 {
-    QDeclarativeView *canvas = createView(SRCDIR "/data/grid.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/gridtest.qml");
 
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
@@ -365,9 +365,10 @@ void tst_QDeclarativePositioners::test_grid_animated()
 }
 void tst_QDeclarativePositioners::test_propertychanges()
 {
-    QDeclarativeView *canvas = createView(SRCDIR "/data/propertychanges.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/propertychangestest.qml");
 
     QDeclarativeGrid *grid = qobject_cast<QDeclarativeGrid*>(canvas->rootObject());
+    QVERIFY(grid != 0);
     QDeclarativeTransition *rowTransition = canvas->rootObject()->findChild<QDeclarativeTransition*>("rowTransition");
     QDeclarativeTransition *columnTransition = canvas->rootObject()->findChild<QDeclarativeTransition*>("columnTransition");
 
@@ -421,7 +422,7 @@ void tst_QDeclarativePositioners::test_propertychanges()
 
 void tst_QDeclarativePositioners::test_repeater()
 {
-    QDeclarativeView *canvas = createView(SRCDIR "/data/repeater.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/repeatertest.qml");
 
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);