diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp')
| -rw-r--r-- | tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index 5ebf10338..1d391101e 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -809,13 +809,13 @@ private Q_SLOTS: QVERIFY(!backendPicker1->isPressed()); QCOMPARE(arbiter.events.count(), 2); change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); - QCOMPARE(change->propertyName(), "clicked"); + QCOMPARE(change->propertyName(), "released"); pickEvent = change->value().value<Qt3DRender::QPickEventPtr>(); QVERIFY(pickEvent); if (pickMethod == Qt3DRender::QPickingSettings::TrianglePicking) QVERIFY(pickEvent.dynamicCast<Qt3DRender::QPickTriangleEvent>()); change = arbiter.events.last().staticCast<Qt3DCore::QPropertyUpdatedChange>(); - QCOMPARE(change->propertyName(), "released"); + QCOMPARE(change->propertyName(), "clicked"); pickEvent = change->value().value<Qt3DRender::QPickEventPtr>(); QVERIFY(pickEvent); if (pickMethod == Qt3DRender::QPickingSettings::TrianglePicking) @@ -1034,9 +1034,9 @@ private Q_SLOTS: QVERIFY(!backendPicker->isPressed()); QCOMPARE(arbiter.events.count(), 2); change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); - QCOMPARE(change->propertyName(), "clicked"); - change = arbiter.events.last().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "released"); + change = arbiter.events.last().staticCast<Qt3DCore::QPropertyUpdatedChange>(); + QCOMPARE(change->propertyName(), "clicked"); arbiter.events.clear(); @@ -1145,7 +1145,10 @@ private Q_SLOTS: change = arbiter1.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "moved"); } else { + QVERIFY(arbiter2.events.size() > 1); change = arbiter2.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); + QCOMPARE(change->propertyName(), "moved"); + change = arbiter2.events.at(1).staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "entered"); } |