diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-13 10:46:43 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-13 10:47:04 +0100 |
| commit | bfb58a7fff934fde6f4c2b4c989f411b43aee8d9 (patch) | |
| tree | 432201a0c7fb6c49d7835f728fc0da97d8742b39 /tests/auto/render/renderviewbuilder | |
| parent | f660c657092811e77aa0ffb8145d6b060464292c (diff) | |
| parent | d69e2c2b42719e6839f32e8ab796cf22d9f29bfa (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ib51c8311ce78b2fec62dd0c09cb943a85a7d0b2b
Diffstat (limited to 'tests/auto/render/renderviewbuilder')
| -rw-r--r-- | tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp index b0f8c1a6d..d18b270c5 100644 --- a/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp @@ -607,7 +607,7 @@ private Q_SLOTS: std::sort(renderableEntity.begin(), renderableEntity.end()); // WHEN - Qt3DRender::Render::RenderViewBuilder::removeEntitiesNotInSubset(renderableEntity, filteredEntity); + renderableEntity = Qt3DRender::Render::RenderViewBuilder::entitiesInSubset(renderableEntity, filteredEntity); // THEN QCOMPARE(renderableEntity.size(), 100); |