diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-06 15:51:14 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-08 13:59:50 +0000 |
| commit | 123f698c5bbf23ad816bf2274620ab4f0a82ed2f (patch) | |
| tree | 12bbb64f44a4110ab1f2d5124245fefdc845d509 /tests/auto/quick/qquickshape | |
| parent | f4f89858cffa1107af5139dfb1e1d7b16ca3a1a0 (diff) | |
Allow freely mixing non-ShapePath objects in Shape
The own list property must be kept. However, we can reuse
QQuickItemPrivate's data accessors in order to start supporting
code like:
Shape {
..
ShapePath { ... }
ShapePath { ... }
Rectangle { ... }
Image { ... }
// any other visual type
// or non-visual:
Timer { ... }
}
Change-Id: I6d502d697cae37bf16857770273a749cee1b3aa3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickshape')
| -rw-r--r-- | tests/auto/quick/qquickshape/tst_qquickshape.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickshape/tst_qquickshape.cpp b/tests/auto/quick/qquickshape/tst_qquickshape.cpp index a984c28732..4f220cf801 100644 --- a/tests/auto/quick/qquickshape/tst_qquickshape.cpp +++ b/tests/auto/quick/qquickshape/tst_qquickshape.cpp @@ -80,7 +80,7 @@ void tst_QQuickShape::initValues() QVERIFY(!obj->asynchronous()); QVERIFY(obj->enableVendorExtensions()); QVERIFY(obj->status() == QQuickShape::Null); - auto vps = obj->elements(); + auto vps = obj->data(); QVERIFY(vps.count(&vps) == 0); delete obj; @@ -97,10 +97,10 @@ void tst_QQuickShape::vpInitValues() QVERIFY(!obj->asynchronous()); QVERIFY(obj->enableVendorExtensions()); QVERIFY(obj->status() == QQuickShape::Null); - auto vps = obj->elements(); + auto vps = obj->data(); QVERIFY(vps.count(&vps) == 2); - QQuickShapePath *vp = vps.at(&vps, 0); + QQuickShapePath *vp = qobject_cast<QQuickShapePath *>(vps.at(&vps, 0)); QVERIFY(vp != nullptr); QQmlListReference pathList(vp, "pathElements"); QCOMPARE(pathList.count(), 0); @@ -128,7 +128,7 @@ void tst_QQuickShape::basicShape() QQuickShape *obj = findItem<QQuickShape>(window->rootObject(), "pathItem"); QVERIFY(obj != nullptr); - QQmlListReference list(obj, "elements"); + QQmlListReference list(obj, "data"); QCOMPARE(list.count(), 1); QQuickShapePath *vp = qobject_cast<QQuickShapePath *>(list.at(0)); QVERIFY(vp != nullptr); @@ -168,7 +168,7 @@ void tst_QQuickShape::changeSignals() obj->setAsynchronous(false); QCOMPARE(asyncPropSpy.count(), 2); - QQmlListReference list(obj, "elements"); + QQmlListReference list(obj, "data"); QQuickShapePath *vp = qobject_cast<QQuickShapePath *>(list.at(0)); QVERIFY(vp != nullptr); |