diff options
author | Charles Yin <charles.yin@nokia.com> | 2011-05-30 15:24:49 +1000 |
---|---|---|
committer | Charles Yin <charles.yin@nokia.com> | 2011-05-30 15:24:49 +1000 |
commit | bb9cef3f5e1a17f8ddfbe7359f60c30701301001 (patch) | |
tree | b484416298aea621a68f5ea30b253f8b2cb8cbc0 /tests/auto/qmltest | |
parent | 339955e8bdcfade2c6d8eb2c2742c8a4615a47e3 (diff) |
fix qmltest unit test failures
Change-Id: I489d1559411f5804f11f4601e34011bc38742b02
Diffstat (limited to 'tests/auto/qmltest')
-rw-r--r-- | tests/auto/qmltest/borderimage/InvalidSciFile.qml (renamed from tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qmltest/borderimage/colors-round.sci (renamed from tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci) | 0 | ||||
-rw-r--r-- | tests/auto/qmltest/borderimage/colors.png (renamed from tests/auto/qmltest/qdeclarativeborderimage/colors.png) | bin | 1655 -> 1655 bytes | |||
-rw-r--r-- | tests/auto/qmltest/borderimage/invalid.sci (renamed from tests/auto/qmltest/qdeclarativeborderimage/invalid.sci) | 0 | ||||
-rw-r--r-- | tests/auto/qmltest/borderimage/tst_borderimage.qml (renamed from tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml) | 4 |
5 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml b/tests/auto/qmltest/borderimage/InvalidSciFile.qml index d8a6d89b92..d8a6d89b92 100644 --- a/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml +++ b/tests/auto/qmltest/borderimage/InvalidSciFile.qml diff --git a/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci b/tests/auto/qmltest/borderimage/colors-round.sci index 5d2f49f0e1..5d2f49f0e1 100644 --- a/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci +++ b/tests/auto/qmltest/borderimage/colors-round.sci diff --git a/tests/auto/qmltest/qdeclarativeborderimage/colors.png b/tests/auto/qmltest/borderimage/colors.png Binary files differindex dfb62f3d64..dfb62f3d64 100644 --- a/tests/auto/qmltest/qdeclarativeborderimage/colors.png +++ b/tests/auto/qmltest/borderimage/colors.png diff --git a/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci b/tests/auto/qmltest/borderimage/invalid.sci index 98c72c9bf1..98c72c9bf1 100644 --- a/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci +++ b/tests/auto/qmltest/borderimage/invalid.sci diff --git a/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml b/tests/auto/qmltest/borderimage/tst_borderimage.qml index 4c2c369fe6..d488fcf2b2 100644 --- 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) |