diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-12-08 12:50:08 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-12-15 08:15:59 +0000 |
| commit | e333c1ac2d0e68a1820073e8f68f467fc73863b3 (patch) | |
| tree | 3d73f574d425083e4fda0494d1c69d5ca06ab77d /tests | |
| parent | fd70c80fe1cac83776cc4730555c8e3dea930c1c (diff) | |
Don't warn about non-existent default properties when one was found
When at least one default property of a target object is considered
valid by an animation, we don't need to warn about other default
properties that weren't found.
Change-Id: I648f17a55fdfcbed2b4c7e94d88206c3dc3d1a32
Task-number: QTBUG-22141
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml | 14 | ||||
| -rw-r--r-- | tests/auto/quick/qquickanimations/tst_qquickanimations.cpp | 20 |
2 files changed, 34 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml b/tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml new file mode 100644 index 0000000000..94692add60 --- /dev/null +++ b/tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml @@ -0,0 +1,14 @@ +import QtQuick 2.0 + +Rectangle { + id: rect + + RotationAnimation { + target: rect + from: 0 + to: 360 + running: true + duration: 1000 + loops: Animation.Infinite + } +} diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp index d234cd2d94..5cad68b275 100644 --- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp +++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp @@ -105,6 +105,7 @@ private slots: void groupAnimationNullChildBug(); void scriptActionCrash(); void animatorInvalidTargetCrash(); + void defaultPropertyWarning(); }; #define QTIMED_COMPARE(lhs, rhs) do { \ @@ -1508,6 +1509,25 @@ void tst_qquickanimations::animatorInvalidTargetCrash() delete obj; } +Q_DECLARE_METATYPE(QList<QQmlError>) + +// QTBUG-22141 +void tst_qquickanimations::defaultPropertyWarning() +{ + QQmlEngine engine; + + qRegisterMetaType<QList<QQmlError> >(); + + QSignalSpy warnings(&engine, SIGNAL(warnings(QList<QQmlError>))); + QVERIFY(warnings.isValid()); + + QQmlComponent component(&engine, testFileUrl("defaultRotationAnimation.qml")); + QScopedPointer<QQuickItem> root(qobject_cast<QQuickItem*>(component.create())); + QVERIFY(root); + + QVERIFY(warnings.isEmpty()); +} + QTEST_MAIN(tst_qquickanimations) #include "tst_qquickanimations.moc" |