diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-09 13:46:14 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:08:37 +0000 |
| commit | a3e2dcf36679a5ae9cb18fe3730d0e3dca6240d6 (patch) | |
| tree | e613d11e42484142a1c044b08035924543864c8f /tests/auto/render/buffer | |
| parent | 9927e58063c7bfcb7fedf4f0e01a672dd6ff6b24 (diff) | |
Remove ChangeFlag from NodeUpdated change type ctors
...and fix resulting compilation issues and tests.
Had to temporarily allow QNode[Added|Removed] property change to be
able to handle QVariant payloads too. This will be split out into
a separate pair of classes in a future commit.
Task-number: QTBUG-51494
Change-Id: I1748e3b8aa3c39fa171ee0c5af4204502826ba07
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/buffer')
| -rw-r--r-- | tests/auto/render/buffer/tst_buffer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index 0481752f1..ec58e3ba8 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.cpp @@ -137,7 +137,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::IndexBuffer)); updateChange->setPropertyName("type"); renderBuffer.sceneChangeEvent(updateChange); @@ -151,7 +151,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::DynamicRead)); updateChange->setPropertyName("usage"); renderBuffer.sceneChangeEvent(updateChange); @@ -164,7 +164,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QByteArrayLiteral("LS9")); updateChange->setPropertyName("data"); renderBuffer.sceneChangeEvent(updateChange); @@ -180,7 +180,7 @@ private Q_SLOTS: // WHEN Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355)); - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(functor)); updateChange->setPropertyName("dataGenerator"); renderBuffer.sceneChangeEvent(updateChange); @@ -193,7 +193,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("syncData"); renderBuffer.sceneChangeEvent(updateChange); |