diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-11-06 01:05:50 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-11-06 01:05:50 (GMT) |
commit | cf6bc08676638b01c0f8a40e001b8fb303aaa5f5 (patch) | |
tree | da68908c51ad09e4d4c721018f34c06cb7a8dc45 /tests/auto | |
parent | 2ba1454ff6e3468f8871d2de3afbef8f80b3da07 (diff) | |
download | Qt-cf6bc08676638b01c0f8a40e001b8fb303aaa5f5.zip Qt-cf6bc08676638b01c0f8a40e001b8fb303aaa5f5.tar.gz Qt-cf6bc08676638b01c0f8a40e001b8fb303aaa5f5.tar.bz2 |
Update semantics of targets/properties and target/property.
This is in preparation for renaming targets -> matchTargets and
properties to matchProperties.
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/declarative/animations/data/badproperty1.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/animations/tst_animations.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/declarative/animations/data/badproperty1.qml b/tests/auto/declarative/animations/data/badproperty1.qml index 78da34a..df1a98d 100644 --- a/tests/auto/declarative/animations/data/badproperty1.qml +++ b/tests/auto/declarative/animations/data/badproperty1.qml @@ -19,6 +19,6 @@ Rectangle { PropertyChanges { target: MyRect; border.color: "blue" } } transitions: Transition { - ColorAnimation { target: MyRect; to: "red"; properties: "pen.colr"; duration: 1000 } + ColorAnimation { target: MyRect; to: "red"; property: "pen.colr"; duration: 1000 } } } diff --git a/tests/auto/declarative/animations/tst_animations.cpp b/tests/auto/declarative/animations/tst_animations.cpp index ca383bb..418a3dc 100644 --- a/tests/auto/declarative/animations/tst_animations.cpp +++ b/tests/auto/declarative/animations/tst_animations.cpp @@ -198,11 +198,12 @@ void tst_animations::badProperties() { QmlEngine engine; QmlComponent c(&engine, QUrl("file://" SRCDIR "/data/badproperty1.qml")); + QTest::ignoreMessage(QtWarningMsg, "QML QmlColorAnimation (file://" SRCDIR "/data/badproperty1.qml:22:9) Cannot animate non-existant property \"pen.colr\""); QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create()); QVERIFY(rect); - QTest::ignoreMessage(QtWarningMsg, "QML QmlColorAnimation (file://" SRCDIR "/data/badproperty1.qml:22:9) Cannot animate non-existant property \"pen.colr\""); - rect->setState("state1"); + //### should we warn here are well? + //rect->setState("state1"); } } |