diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2017-02-28 18:09:26 +0200 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-03-15 07:59:37 +0000 |
| commit | 9f94d7517c3060d29682f84ca31005ecacf32447 (patch) | |
| tree | 0339eaa78b22a7817fb9f9ded60004428ce9f72b /tests/auto/render/objectpicker | |
| parent | 70bfbe58d2de2dfd6a3aadf0bec3b5e09ed5dc80 (diff) | |
Cleanup scene2d - remove event forward
Remove event forward related stuff as they are no longer necessary after
the mouse event changes.
Task-number: QTBUG-58876
Change-Id: I2c9c52e41d5af3078d04ac9d5cc66753898e0ad9
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'tests/auto/render/objectpicker')
| -rw-r--r-- | tests/auto/render/objectpicker/tst_objectpicker.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index 4ba57b0ad..c1b06ccd8 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -46,9 +46,7 @@ private Q_SLOTS: // GIVEN Qt3DRender::Render::ObjectPicker objectPicker; Qt3DRender::QObjectPicker picker; - Qt3DRender::QEventForward eventForward; picker.setHoverEnabled(true); - picker.setEventForward(&eventForward); // WHEN simulateInitialization(&picker, &objectPicker); @@ -56,7 +54,6 @@ private Q_SLOTS: // THEN QVERIFY(!objectPicker.peerId().isNull()); QCOMPARE(objectPicker.isHoverEnabled(), true); - QCOMPARE(objectPicker.eventForward(), eventForward.id()); } void checkInitialAndCleanedUpState() @@ -67,8 +64,6 @@ private Q_SLOTS: // THEN QVERIFY(objectPicker.peerId().isNull()); QCOMPARE(objectPicker.isHoverEnabled(), false); - QCOMPARE(objectPicker.isEventForwardingEnabled(), false); - QCOMPARE(objectPicker.eventForward(), Qt3DCore::QNodeId()); // GIVEN Qt3DRender::QObjectPicker picker; @@ -80,8 +75,6 @@ private Q_SLOTS: // THEN QCOMPARE(objectPicker.isHoverEnabled(), false); - QCOMPARE(objectPicker.isEventForwardingEnabled(), false); - QCOMPARE(objectPicker.eventForward(), Qt3DCore::QNodeId()); } void checkPropertyChanges() @@ -90,7 +83,6 @@ private Q_SLOTS: TestRenderer renderer; { Qt3DRender::Render::ObjectPicker objectPicker; - Qt3DRender::QEventForward eventForward; objectPicker.setRenderer(&renderer); // WHEN @@ -102,15 +94,6 @@ private Q_SLOTS: // THEN QCOMPARE(objectPicker.isHoverEnabled(), true); QVERIFY(renderer.dirtyBits() != 0); - - // WHEN - updateChange->setValue(QVariant::fromValue(eventForward.id())); - updateChange->setPropertyName("eventForward"); - objectPicker.sceneChangeEvent(updateChange); - - // THEN - QCOMPARE(objectPicker.isEventForwardingEnabled(), true); - QCOMPARE(objectPicker.eventForward(), eventForward.id()); } } |