fix qmltest unit test failures

Change-Id: I489d1559411f5804f11f4601e34011bc38742b02

diff --git a/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml b/tests/auto/qmltest/borderimage/InvalidSciFile.qml
similarity index 100%
rename from tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml
rename to tests/auto/qmltest/borderimage/InvalidSciFile.qml

diff --git a/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci b/tests/auto/qmltest/borderimage/colors-round.sci
similarity index 100%
rename from tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci
rename to tests/auto/qmltest/borderimage/colors-round.sci

diff --git a/tests/auto/qmltest/qdeclarativeborderimage/colors.png b/tests/auto/qmltest/borderimage/colors.png
similarity index 100%
rename from tests/auto/qmltest/qdeclarativeborderimage/colors.png
rename to tests/auto/qmltest/borderimage/colors.png

diff --git a/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci b/tests/auto/qmltest/borderimage/invalid.sci
similarity index 100%
rename from tests/auto/qmltest/qdeclarativeborderimage/invalid.sci
rename to tests/auto/qmltest/borderimage/invalid.sci

diff --git a/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml b/tests/auto/qmltest/borderimage/tst_borderimage.qml
similarity index 97%
rename from tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml
rename to tests/auto/qmltest/borderimage/tst_borderimage.qml
index 4c2c369..d488fcf 100644 (file)
--- a/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml
+++ b/tests/auto/qmltest/borderimage/tst_borderimage.qml
@@ -231,8 +231,8 @@ Item {
 
 
         function test_invalidSciFile() {
-            ignoreWarning("QDeclarativeGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Roun"
-            ignoreWarning("QDeclarativeGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Repea"
+            ignoreWarning("QSGGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Roun"
+            ignoreWarning("QSGGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Repea"
 
             var component = Qt.createComponent("InvalidSciFile.qml")
             var invalidSciFile = component.createObject(top)