diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-11-04 15:04:54 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-16 09:17:38 +0000 |
| commit | cb99c0358a9ec6d51a165ff4513b146f45f5fb9f (patch) | |
| tree | 26689e2c471edaa3ad323dba07af780d0a3be25e /tests/auto/render/objectpicker | |
| parent | 6002528b4610f8223b97b3f5d34a0cb1e0e98393 (diff) | |
Remove anything related to pick attribute in QObjectPicker
Change-Id: I5a25c97841854bd231af0600ecfe08ff4c056de1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'tests/auto/render/objectpicker')
| -rw-r--r-- | tests/auto/render/objectpicker/tst_objectpicker.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index 08c726c41..ce0314ef8 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -37,7 +37,6 @@ #include <QtTest/QTest> #include <Qt3DRender/private/objectpicker_p.h> #include <Qt3DRender/qobjectpicker.h> -#include <Qt3DRender/qattribute.h> #include <Qt3DCore/private/qbackendnode_p.h> #include <Qt3DCore/qscenepropertychange.h> #include "testpostmanarbiter.h" @@ -52,16 +51,13 @@ private Q_SLOTS: // GIVEN Qt3DRender::Render::ObjectPicker objectPicker; Qt3DRender::QObjectPicker picker; - Qt3DRender::QAttribute attr; picker.setHoverEnabled(true); - picker.setPickAttribute(&attr); // WHEN objectPicker.setPeer(&picker); // THEN QVERIFY(!objectPicker.peerUuid().isNull()); - QVERIFY(!objectPicker.pickAttributeId().isNull()); QCOMPARE(objectPicker.hoverEnabled(), true); QCOMPARE(objectPicker.isDirty(), true); } @@ -73,15 +69,12 @@ private Q_SLOTS: // THEN QVERIFY(objectPicker.peerUuid().isNull()); - QVERIFY(objectPicker.pickAttributeId().isNull()); QCOMPARE(objectPicker.hoverEnabled(), false); QCOMPARE(objectPicker.isDirty(), false); // GIVEN Qt3DRender::QObjectPicker picker; - Qt3DRender::QAttribute attr; picker.setHoverEnabled(true); - picker.setPickAttribute(&attr); // WHEN objectPicker.updateFromPeer(&picker); @@ -89,7 +82,6 @@ private Q_SLOTS: // THEN QVERIFY(objectPicker.peerUuid().isNull()); - QVERIFY(objectPicker.pickAttributeId().isNull()); QCOMPARE(objectPicker.hoverEnabled(), false); QCOMPARE(objectPicker.isDirty(), false); } @@ -113,20 +105,6 @@ private Q_SLOTS: objectPicker.unsetDirty(); QVERIFY(!objectPicker.isDirty()); - - // WHEN - Qt3DRender::QAttribute attr; - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setValue(QVariant::fromValue(attr.id())); - updateChange->setPropertyName("pickAttribute"); - objectPicker.sceneChangeEvent(updateChange); - - // THEN - QCOMPARE(objectPicker.pickAttributeId(), attr.id()); - QVERIFY(objectPicker.isDirty()); - - objectPicker.unsetDirty(); - QVERIFY(!objectPicker.isDirty()); } void checkBackendPropertyNotifications() |