Make sample meshes geometry renderers again

Introduce new geometry view class for each.

Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

96 files changed, 351 insertions, 556 deletions

diff --git a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
index c765947ae..ba245cb34 100644
--- a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
+++ b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
@@ -114,9 +114,7 @@ Qt3DCore::QEntity *createScene(QWindow *w)
     torusTransform->setScale3D(QVector3D(1.5, 1, 0.5));
     torusTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f));
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(torusMesh);
-    torusEntity->addComponent(renderer);
+    torusEntity->addComponent(torusMesh);
     torusEntity->addComponent(torusTransform);
     torusEntity->addComponent(material);
 
@@ -127,10 +125,7 @@ Qt3DCore::QEntity *createScene(QWindow *w)
 
     Qt3DCore::QTransform *sphereTransform = new Qt3DCore::QTransform;
 
-    renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(sphereMesh);
-
-    sphereEntity->addComponent(renderer);
+    sphereEntity->addComponent(sphereMesh);
     sphereEntity->addComponent(sphereTransform);
     sphereEntity->addComponent(material);
 
diff --git a/tests/auto/render/boundingsphere/cube.qml b/tests/auto/render/boundingsphere/cube.qml
index eb437404a..11d6d4db1 100644
--- a/tests/auto/render/boundingsphere/cube.qml
+++ b/tests/auto/render/boundingsphere/cube.qml
@@ -61,7 +61,7 @@ Entity {
     Entity {
 
         components: [
-            GeometryRenderer { id: testMesh; objectName: "testMesh"; view: CuboidMesh { } },
+            CuboidMesh { id: testMesh; objectName: "testMesh" },
             PhongMaterial { id: material }
         ]
     }
diff --git a/tests/auto/render/boundingsphere/sphere.qml b/tests/auto/render/boundingsphere/sphere.qml
index c4b78824d..1f0e2245a 100644
--- a/tests/auto/render/boundingsphere/sphere.qml
+++ b/tests/auto/render/boundingsphere/sphere.qml
@@ -61,7 +61,7 @@ Entity {
     Entity {
 
         components: [
-            GeometryRenderer { id: testMesh; objectName: "testMesh"; view: SphereMesh { } },
+            SphereMesh { id: testMesh; objectName: "testMesh" },
             PhongMaterial { id: material }
         ]
     }
diff --git a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp
index 813157251..a167fc140 100644
--- a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp
+++ b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp
@@ -327,9 +327,7 @@ void tst_gltfPlugins::createTestScene()
         mesh->setYZMeshResolution(QSize(2, 2));
         mesh->setYZMeshResolution(QSize(2, 3));
         mesh->setYZMeshResolution(QSize(3, 2));
-        Qt3DRender::QGeometryRenderer *renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
-        createAndAddEntity(QStringLiteral("Cube with DiffuseMap"), renderer, material, transform);
+        createAndAddEntity(QStringLiteral("Cube with DiffuseMap"), mesh, material, transform);
     }
     // Cone with PhongAlpha
     {
@@ -353,9 +351,7 @@ void tst_gltfPlugins::createTestScene()
         mesh->setTopRadius(0.5f);
         mesh->setBottomRadius(1.5f);
         mesh->setLength(0.9f);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
-        createAndAddEntity(QStringLiteral("Cone with PhongAlpha"), renderer, material, transform);
+        createAndAddEntity(QStringLiteral("Cone with PhongAlpha"), mesh, material, transform);
     }
     // Cylinder with Phong
     {
@@ -372,9 +368,7 @@ void tst_gltfPlugins::createTestScene()
         mesh->setRings(3);
         mesh->setLength(1.2f);
         mesh->setSlices(16);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
-        createAndAddEntity(QStringLiteral("Cylinder with Phong"), renderer, material, transform);
+        createAndAddEntity(QStringLiteral("Cylinder with Phong"), mesh, material, transform);
     }
     // Plane with DiffuseSpecularMap
     {
@@ -399,10 +393,8 @@ void tst_gltfPlugins::createTestScene()
         mesh->setMeshResolution(QSize(3, 3));
         mesh->setHeight(1.5f);
         mesh->setWidth(1.2f);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
         createAndAddEntity(QStringLiteral("Plane with DiffuseSpecularMap"),
-                           renderer, material, transform);
+                           mesh, material, transform);
     }
     // Sphere with NormalDiffuseMap
     {
@@ -430,10 +422,8 @@ void tst_gltfPlugins::createTestScene()
         mesh->setRings(16);
         mesh->setSlices(16);
         mesh->setGenerateTangents(true);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
         createAndAddEntity(QStringLiteral("Sphere with NormalDiffuseMap"),
-                           renderer, material, transform);
+                           mesh, material, transform);
     }
     // Sphere with NormalDiffuseMapAlpha
     {
@@ -461,10 +451,8 @@ void tst_gltfPlugins::createTestScene()
         mesh->setRings(16);
         mesh->setSlices(16);
         mesh->setGenerateTangents(true);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
         createAndAddEntity(QStringLiteral("Sphere with NormalDiffuseMapAlpha"),
-                           renderer, material, transform);
+                           mesh, material, transform);
     }
     // Sphere with NormalDiffuseSpecularMap
     {
@@ -495,10 +483,8 @@ void tst_gltfPlugins::createTestScene()
         mesh->setRings(16);
         mesh->setSlices(16);
         mesh->setGenerateTangents(true);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
         createAndAddEntity(QStringLiteral("Sphere with NormalDiffuseSpecularMap"),
-                           renderer, material, transform);
+                           mesh, material, transform);
     }
     // Torus with Gooch
     {
@@ -520,9 +506,7 @@ void tst_gltfPlugins::createTestScene()
         mesh->setMinorRadius(0.5f);
         mesh->setRings(16);
         mesh->setSlices(16);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
-        createAndAddEntity(QStringLiteral("Torus with Gooch"), renderer, material, transform);
+        createAndAddEntity(QStringLiteral("Torus with Gooch"), mesh, material, transform);
     }
     // Custom cube with per-vertex colors
     {
@@ -533,7 +517,7 @@ void tst_gltfPlugins::createTestScene()
 
         Qt3DRender::QGeometryRenderer *boxMesh = createCustomCube();
         Qt3DCore::QBuffer *colorDataBuffer =
-            new Qt3DCore::QBuffer(boxMesh->view()->geometry());
+            new Qt3DCore::QBuffer(boxMesh->geometry());
         QByteArray colorBufferData;
         colorBufferData.resize(8 * 4 * sizeof(float));
 
@@ -547,7 +531,7 @@ void tst_gltfPlugins::createTestScene()
 
         colorDataBuffer->setData(colorBufferData);
 
-        addColorAttributeToGeometry(boxMesh->view()->geometry(), colorDataBuffer, 8);
+        addColorAttributeToGeometry(boxMesh->geometry(), colorDataBuffer, 8);
 
         createAndAddEntity(QStringLiteral("Custom cube with per-vertex colors"),
                            boxMesh, material, transform);
@@ -568,10 +552,8 @@ void tst_gltfPlugins::createTestScene()
         mesh->setRings(3);
         mesh->setLength(1.5f);
         mesh->setSlices(16);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
         createAndAddEntity(QStringLiteral("Child with Phong"),
-                           renderer, material, transform, parentEntity);
+                           mesh, material, transform, parentEntity);
     }
     // Cube with custom material
     {
@@ -590,7 +572,7 @@ void tst_gltfPlugins::createTestScene()
         transform->setRotation(Qt3DCore::QTransform::fromAxisAndAngle(1.0f, 2.0f, 3.0f, 90.0f));
         Qt3DRender::QGeometryRenderer *boxMesh = createCustomCube();
         Qt3DCore::QBuffer *offsetBuffer =
-            new Qt3DCore::QBuffer(boxMesh->view()->geometry());
+            new Qt3DCore::QBuffer(boxMesh->geometry());
         QByteArray offsetBufferData;
         offsetBufferData.resize(8 * 3 * sizeof(float));
 
@@ -613,7 +595,7 @@ void tst_gltfPlugins::createTestScene()
         customAttribute->setCount(8);
         customAttribute->setName(QStringLiteral("vertexOffset"));
 
-        boxMesh->view()->geometry()->addAttribute(customAttribute);
+        boxMesh->geometry()->addAttribute(customAttribute);
 
         createAndAddEntity(QStringLiteral("Custom cube with on-top material"),
                            boxMesh, material, transform);
@@ -751,8 +733,12 @@ void tst_gltfPlugins::compareComponents(Qt3DCore::QComponent *c1, Qt3DCore::QCom
         if (auto mesh1 = qobject_cast<Qt3DRender::QGeometryRenderer *>(c1)) {
             auto mesh2 = qobject_cast<Qt3DRender::QGeometryRenderer *>(c2);
             QVERIFY(mesh2 != nullptr);
-            auto geometry1 = mesh1->view()->geometry();
-            auto geometry2 = mesh2->view()->geometry();
+            auto geometry1 = mesh1->geometry();
+            if (!geometry1 && mesh1->view())
+                geometry1 = mesh1->view()->geometry();
+            auto geometry2 = mesh2->geometry();
+            if (!geometry2 && mesh2->view())
+                geometry2 = mesh2->view()->geometry();
             // Check that attributes match.
             compareAttributes(
                         findAttribute(Qt3DCore::QAttribute::defaultPositionAttributeName(),
@@ -980,8 +966,8 @@ QUrl tst_gltfPlugins::getTextureUrl(Qt3DRender::QAbstractTexture *tex)
 
 Qt3DRender::QGeometryRenderer *tst_gltfPlugins::createCustomCube()
 {
-    Qt3DCore::QGeometryView *boxView = new Qt3DCore::QGeometryView();
-    Qt3DCore::QGeometry *boxGeometry = new Qt3DCore::QGeometry(boxView);
+    Qt3DRender::QGeometryRenderer *boxMesh = new Qt3DRender::QGeometryRenderer;
+    Qt3DCore::QGeometry *boxGeometry = new Qt3DCore::QGeometry(boxMesh);
     Qt3DCore::QBuffer *boxDataBuffer =
             new Qt3DCore::QBuffer(boxGeometry);
     Qt3DCore::QBuffer *indexDataBuffer =
@@ -1024,15 +1010,13 @@ Qt3DRender::QGeometryRenderer *tst_gltfPlugins::createCustomCube()
     addPositionAttributeToGeometry(boxGeometry, boxDataBuffer, 8);
     addIndexAttributeToGeometry(boxGeometry, indexDataBuffer, 36);
 
-    boxView->setInstanceCount(1);
-    boxView->setIndexOffset(0);
-    boxView->setFirstInstance(0);
-    boxView->setVertexCount(36);
-    boxView->setPrimitiveType(Qt3DCore::QGeometryView::Triangles);
-    boxView->setGeometry(boxGeometry);
+    boxMesh->setInstanceCount(1);
+    boxMesh->setIndexOffset(0);
+    boxMesh->setFirstInstance(0);
+    boxMesh->setVertexCount(36);
+    boxMesh->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles);
+    boxMesh->setGeometry(boxGeometry);
 
-    Qt3DRender::QGeometryRenderer *boxMesh = new Qt3DRender::QGeometryRenderer;
-    boxMesh->setView(boxView);
     return boxMesh;
 }
 
@@ -1218,6 +1202,7 @@ void tst_gltfPlugins::exportAndImport()
         Qt3DCore::QEntity *importedEntity = findChildEntity(importedScene, name);
         QVERIFY(importedEntity != nullptr);
         if (importedEntity) {
+            qDebug() << importedEntity->objectName();
             compareComponents(transformComponent(exportedEntity),
                               transformComponent(importedEntity));
             compareComponents(lightComponent(exportedEntity),
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml
index 9e56d7641..87e7a8aac 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     Entity {
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml
index 29094d8e3..7376b53e5 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Parent Entity
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml
index a2cbd7117..9b7f973a9 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml
index 73f1108b4..747b7e858 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml
index cdacf849d..f80726068 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml
index d54470119..4280b8555 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml
index 37140494d..f0b88acba 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml
@@ -79,7 +79,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml
index bb360c1bc..86471f8b2 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml
@@ -99,7 +99,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml
index ce171de9e..759544bb9 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Parent Entity
@@ -104,11 +104,9 @@ Entity {
 
         Entity {
             components: [
-                GeometryRenderer {
-                    view: PlaneMesh {
-                        width: 100
-                        height: 100
-                    }
+                PlaneMesh {
+                    width: 100
+                    height: 100
                 },
                 PhongMaterial {
                 }
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml
index 860fc2400..a24289835 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml
@@ -96,7 +96,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml
index be83fc75f..7cacb3d2d 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml
@@ -100,7 +100,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
     PhongMaterial { id: material }
 
     // Entity 1
diff --git a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml
index 0b9c20a94..daafc0edd 100644
--- a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml
+++ b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml
@@ -127,7 +127,7 @@ Entity {
         }
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
 
     Entity {
         readonly property ObjectPicker objectPicker: ObjectPicker {
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp
index f89463776..9fe15c334 100644
--- a/tests/auto/render/picking/tst_picking.cpp
+++ b/tests/auto/render/picking/tst_picking.cpp
@@ -71,18 +71,15 @@ public:
         , clickedCalled(0)
     {
         mesh->setRadius(radius);
-        QSphereGeometry *g = static_cast<QSphereGeometry *>(mesh->geometry());
+        QSphereGeometry *g = static_cast<QSphereGeometry *>(mesh->view()->geometry());
         QAttribute *positionAttr = static_cast<QAttribute *>(g->attributes().first());
         Qt3DCore::QBuffer *vertexBuffer = static_cast<Qt3DCore::QBuffer *>(positionAttr->buffer());
         Q_UNUSED(vertexBuffer);
 
         transform->setTranslation(position);
 
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
-
         addComponent(picker);
-        addComponent(renderer);
+        addComponent(mesh);
         addComponent(transform);
 
         QObject::connect(picker, &QObjectPicker::pressed, this, &PickableEntity::onPressed);
diff --git a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml
index 198148560..47221aec8 100644
--- a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml
+++ b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml
@@ -112,14 +112,12 @@ Entity {
         onReleased: { caster.trigger(Qt.point(mouse.x, mouse.y)); }
     }
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 100
-            slices: 20
-        }
+        radius: 1
+        length: 3
+        rings: 100
+        slices: 20
     }
     PhongMaterial { id: material }
 
diff --git a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml
index aea697fba..cdb6b9234 100644
--- a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml
+++ b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml
@@ -105,14 +105,12 @@ Entity {
         }
     ]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 10
-            slices: 10
-        }
+        radius: 1
+        length: 3
+        rings: 10
+        slices: 10
     }
     PhongMaterial { id: material }
 
diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml
index a8db4e5c0..efcc31e8f 100644
--- a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml
+++ b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml
@@ -107,14 +107,12 @@ Entity {
         }
     ]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 10
-            slices: 10
-        }
+        radius: 1
+        length: 3
+        rings: 10
+        slices: 10
     }
     PhongMaterial { id: material }
 
diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml
index ff6c413cb..5c6170ae6 100644
--- a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml
+++ b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml
@@ -107,14 +107,12 @@ Entity {
         }
     ]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 10
-            slices: 10
-        }
+        radius: 1
+        length: 3
+        rings: 10
+        slices: 10
     }
     PhongMaterial { id: material }
 
diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml
index 54d2586f7..99ca26d6f 100644
--- a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml
+++ b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml
@@ -107,14 +107,12 @@ Entity {
         }
     ]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 10
-            slices: 10
-        }
+        radius: 1
+        length: 3
+        rings: 10
+        slices: 10
     }
     PhongMaterial { id: material }
 
diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
index ae6add27c..d1cbf2e34 100644
--- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
+++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
@@ -223,11 +223,8 @@ Qt3DCore::QEntity *buildBigScene()
         m.rotate(45.0f * i, QVector3D(0.0f, 0.0f, 1.0f));
         transform->setMatrix(m);
 
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(mesh);
-
         e->addComponent(transform);
-        e->addComponent(renderer);
+        e->addComponent(mesh);
         e->addComponent(material);
         e->setParent(root);
     }
diff --git a/tests/manual/animation-keyframe-blendtree/main.qml b/tests/manual/animation-keyframe-blendtree/main.qml
index b11118cd6..74413b4e2 100644
--- a/tests/manual/animation-keyframe-blendtree/main.qml
+++ b/tests/manual/animation-keyframe-blendtree/main.qml
@@ -75,8 +75,7 @@ DefaultSceneEntity {
                 translation: Qt.vector3d(5, 0, 0)
                 onTranslationChanged: console.log("t = " + translation)
             },
-            GeometryRenderer {
-                view: CuboidMesh { }
+            CuboidMesh {
             },
             PhongMaterial {
                 id: cubeMaterial
diff --git a/tests/manual/animation-keyframe-programmatic/main.qml b/tests/manual/animation-keyframe-programmatic/main.qml
index 8c9d3d3f7..c34e44d51 100644
--- a/tests/manual/animation-keyframe-programmatic/main.qml
+++ b/tests/manual/animation-keyframe-programmatic/main.qml
@@ -66,8 +66,7 @@ DefaultSceneEntity {
 
                 onTranslationChanged: console.log("t = " + translation)
             },
-            GeometryRenderer {
-                view: CuboidMesh { }
+            CuboidMesh {
             },
             PhongMaterial {
                 id: cubeMaterial
diff --git a/tests/manual/animation-keyframe-simple/main.qml b/tests/manual/animation-keyframe-simple/main.qml
index 247048b2f..9246f2467 100644
--- a/tests/manual/animation-keyframe-simple/main.qml
+++ b/tests/manual/animation-keyframe-simple/main.qml
@@ -66,8 +66,7 @@ DefaultSceneEntity {
 
                 onTranslationChanged: console.log("t = " + translation)
             },
-            GeometryRenderer {
-                view: CuboidMesh { }
+            CuboidMesh {
             },
             PhongMaterial {
                 id: cubeMaterial
diff --git a/tests/manual/bigmodel-qml/MyEntity.qml b/tests/manual/bigmodel-qml/MyEntity.qml
index d340e088f..0289295cf 100644
--- a/tests/manual/bigmodel-qml/MyEntity.qml
+++ b/tests/manual/bigmodel-qml/MyEntity.qml
@@ -61,10 +61,10 @@ Entity {
 
     components: [
         Transform { id: transform },
-        GeometryRenderer { view: SphereMesh { radius: 2 } },
+        SphereMesh { radius: 2 },
         PhongMaterial { id: material },
         ObjectPicker {
-                onClicked: console.log("Clicked", root.name, pick.distance, pick.triangleIndex)
-            }
+            onClicked: console.log("Clicked", root.name, pick.distance, pick.triangleIndex)
+        }
     ]
 }
diff --git a/tests/manual/bigscene-cpp/main.cpp b/tests/manual/bigscene-cpp/main.cpp
index 5a66cb213..e8a4aed7c 100644
--- a/tests/manual/bigscene-cpp/main.cpp
+++ b/tests/manual/bigscene-cpp/main.cpp
@@ -133,9 +133,6 @@ int main(int ac, char **av)
     mesh->setRadius(2.5f);
     mesh->setLength(5.0f);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(mesh);
-
     // Material
     auto phongMaterial = new Qt3DExtras::QPhongMaterial(root);
     auto effect = phongMaterial->effect();
@@ -158,7 +155,7 @@ int main(int ac, char **av)
     // Scene
     for (int i = 0; i < max; i++) {
         Entity *e = new Entity(effect, root);
-        e->addComponent(renderer);
+        e->addComponent(mesh);
         const double angle = M_PI * 2.0 * double(i) * det * 10.;
 
         e->setDiffuseColor(QColor(int(qFabs(qCos(angle)) * 255.0), 204, 75));
diff --git a/tests/manual/bigscene-instanced-qml/main.qml b/tests/manual/bigscene-instanced-qml/main.qml
index 65273b1ab..506f882da 100644
--- a/tests/manual/bigscene-instanced-qml/main.qml
+++ b/tests/manual/bigscene-instanced-qml/main.qml
@@ -109,19 +109,16 @@ Entity {
                 }
             }
         }
-        parameters: Parameter { name: "instanceCount"; value: cylinderMeshInstanced.instanceCount }
+        parameters: Parameter { name: "instanceCount"; value: cylinderMeshRenderer.instanceCount }
     }
 
-    GeometryRenderer {
+    CylinderMesh {
         id: cylinderMeshRenderer
-        view: CylinderMesh {
-            id: cylinderMeshInstanced
-            instanceCount: 2000
-            rings: 50
-            slices: 30
-            radius: 2.5
-            length: 5.0
-        }
+        view.instanceCount: 2000
+        rings: 50
+        slices: 30
+        radius: 2.5
+        length: 5.0
     }
 
     Entity {
diff --git a/tests/manual/blitframebuffer-qml/main.qml b/tests/manual/blitframebuffer-qml/main.qml
index 4ca7b7e23..4b3c1915b 100644
--- a/tests/manual/blitframebuffer-qml/main.qml
+++ b/tests/manual/blitframebuffer-qml/main.qml
@@ -220,14 +220,12 @@ Entity {
         id: material
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
@@ -241,11 +239,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/boundingvolumes/AnimatedEntity.qml b/tests/manual/boundingvolumes/AnimatedEntity.qml
index 3cd8195f5..e3724968e 100644
--- a/tests/manual/boundingvolumes/AnimatedEntity.qml
+++ b/tests/manual/boundingvolumes/AnimatedEntity.qml
@@ -87,7 +87,7 @@ Entity {
     Entity {
         id: sphereEntity1
         components: [
-            GeometryRenderer { view: SphereMesh { radius: 4 } },
+            SphereMesh { radius: 4 },
             PhongMaterial { diffuse: "blue" },
             Transform { translation: Qt.vector3d(mainAnimation.x, 9, 0) }
         ]
@@ -97,7 +97,7 @@ Entity {
     Entity {
         id: sphereEntity2
         components: [
-            GeometryRenderer { view: SphereMesh { radius: 4 } },
+            SphereMesh { radius: 4 },
             PhongMaterial { diffuse: "red" },
             Transform { translation: Qt.vector3d(mainAnimation.x, -9, 0) },
             BoundingVolume { view: SphereMesh { radius: 2 } }
@@ -108,10 +108,10 @@ Entity {
     Entity {
         id: sphereEntity3
         components: [
-            GeometryRenderer {
-                view: SphereMesh { radius: 4 }
-                minPoint: Qt.vector3d(-.5, -.5, -.5)
-                maxPoint: Qt.vector3d(.5, .5, .5)
+            SphereMesh {
+                radius: 4
+                view.minPoint: Qt.vector3d(-.5, -.5, -.5)
+                view.maxPoint: Qt.vector3d(.5, .5, .5)
             },
             PhongMaterial { diffuse: "green" },
             Transform { translation: Qt.vector3d(mainAnimation.x, 0 , 0) }
diff --git a/tests/manual/clip-planes-qml/ClipPlaneEntity.qml b/tests/manual/clip-planes-qml/ClipPlaneEntity.qml
index 90dada071..4bd2028b6 100644
--- a/tests/manual/clip-planes-qml/ClipPlaneEntity.qml
+++ b/tests/manual/clip-planes-qml/ClipPlaneEntity.qml
@@ -67,13 +67,11 @@ Entity {
                                                        normal.y * center.y +
                                                        normal.z * center.z))
 
-    GeometryRenderer {
+    PlaneMesh {
         id: mesh
-        view: PlaneMesh {
-            width: 20.0
-            height: 20.0
-            meshResolution: Qt.size(2, 2)
-        }
+        width: 20.0
+        height: 20.0
+        meshResolution: Qt.size(2, 2)
     }
 
     Transform {
diff --git a/tests/manual/clip-planes-qml/ClippingPlanes.qml b/tests/manual/clip-planes-qml/ClippingPlanes.qml
index 7813dc770..e8f90f5e7 100644
--- a/tests/manual/clip-planes-qml/ClippingPlanes.qml
+++ b/tests/manual/clip-planes-qml/ClippingPlanes.qml
@@ -83,12 +83,10 @@ Entity {
             }
         }
 
-        property GeometryRenderer mesh: GeometryRenderer {
-            view: PlaneMesh {
-                width: 20.0
-                height: 20.0
-                meshResolution: Qt.size(2, 2)
-            }
+        property GeometryRenderer mesh: PlaneMesh {
+            width: 20.0
+            height: 20.0
+            meshResolution: Qt.size(2, 2)
         }
 
         components: [cappingMaterial, mesh, root.capsLayer]
diff --git a/tests/manual/component-changes/main.cpp b/tests/manual/component-changes/main.cpp
index 095065ad4..88804b80a 100644
--- a/tests/manual/component-changes/main.cpp
+++ b/tests/manual/component-changes/main.cpp
@@ -128,17 +128,11 @@ int main(int argc, char **argv)
     cylinderMesh->setRings(5);
     cylinderMesh->setSlices(40);
 
-    auto cylinderRenderer = new Qt3DRender::QGeometryRenderer;
-    cylinderRenderer->setView(cylinderMesh);
-
     // Sphere mesh data
     Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh();
     sphereMesh->setRings(20);
     sphereMesh->setSlices(40);
 
-    auto sphereRenderer = new Qt3DRender::QGeometryRenderer;
-    sphereRenderer->setView(sphereMesh);
-
     // Transform for cylinder
     Qt3DCore::QTransform *transform = new Qt3DCore::QTransform;
     transform->setScale(1.5f);
@@ -157,7 +151,7 @@ int main(int argc, char **argv)
     view.setRootEntity(rootEntity);
     view.show();
 
-    ComponentSwapper *swapper = new ComponentSwapper(cylinder, cylinderRenderer, sphereRenderer);
+    ComponentSwapper *swapper = new ComponentSwapper(cylinder, cylinderMesh, sphereMesh);
     QTimer *timer = new QTimer;
     QObject::connect(timer, SIGNAL(timeout()), swapper, SLOT(swapComponents()));
     timer->start(2000);
diff --git a/tests/manual/compressed_textures/main.qml b/tests/manual/compressed_textures/main.qml
index bd83a4836..cf0e11bc6 100644
--- a/tests/manual/compressed_textures/main.qml
+++ b/tests/manual/compressed_textures/main.qml
@@ -99,7 +99,7 @@ QQ2.Item {
             ]
 
             Entity {
-                readonly property GeometryRenderer mesh: GeometryRenderer { view: CuboidMesh { } }
+                readonly property GeometryRenderer mesh: CuboidMesh { }
                 readonly property DiffuseMapMaterial material: DiffuseMapMaterial {
                     diffuse: TextureLoader {
                         source: textureSource
diff --git a/tests/manual/cylinder-cpp/main.cpp b/tests/manual/cylinder-cpp/main.cpp
index f80bf2e8b..33a85f32b 100644
--- a/tests/manual/cylinder-cpp/main.cpp
+++ b/tests/manual/cylinder-cpp/main.cpp
@@ -106,12 +106,9 @@ int main(int argc, char **argv)
     Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity);
     material->setDiffuse(Qt::red);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(mesh);
-
     // Cylinder
     Qt3DCore::QEntity *cylinder = new Qt3DCore::QEntity(rootEntity);
-    cylinder->addComponent(renderer);
+    cylinder->addComponent(mesh);
     cylinder->addComponent(transform);
     cylinder->addComponent(material);
 
diff --git a/tests/manual/cylinder-parent-test/main.cpp b/tests/manual/cylinder-parent-test/main.cpp
index 09c5f32bb..441530e89 100644
--- a/tests/manual/cylinder-parent-test/main.cpp
+++ b/tests/manual/cylinder-parent-test/main.cpp
@@ -59,12 +59,12 @@ int main(int argc, char **argv)
     QGuiApplication app(argc, argv);
     Qt3DExtras::Qt3DWindow view;
 
-    QLoggingCategory::setFilterRules("Qt3D.Renderer.RenderNodes=true");
+    QLoggingCategory::setFilterRules(QLatin1String("Qt3D.Renderer.RenderNodes=true"));
 
     // Root entity
     Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
     view.setRootEntity(rootEntity);
-    rootEntity->setObjectName("Root Entity");
+    rootEntity->setObjectName(QLatin1String("Root Entity"));
 
     // Set root object of the scene
     view.show();
@@ -83,9 +83,6 @@ int main(int argc, char **argv)
     // Cylinder shape data
     Qt3DExtras::QCylinderMesh *mesh = new Qt3DExtras::QCylinderMesh();
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(mesh);
-
     qDebug() << "Setup complete.  Creating cylinders\n";
 
     // simple setParent from nullptr (OK for QTBUG-73905)
@@ -93,20 +90,20 @@ int main(int argc, char **argv)
     {
         Qt3DCore::QTransform *leftTransform = new Qt3DCore::QTransform;
         leftTransform->setTranslation(QVector3D(-5, -2, 0));
-        leftTransform->setObjectName("Green transform");
+        leftTransform->setObjectName(QLatin1String("Green transform"));
 
         Qt3DExtras::QPhongMaterial *greenMaterial = new Qt3DExtras::QPhongMaterial(rootEntity);
-        greenMaterial->setObjectName("Green Material");
+        greenMaterial->setObjectName(QLatin1String("Green Material"));
         greenMaterial->setDiffuse(Qt::green);
 
         Qt3DCore::QEntity *grandParentNode = new Qt3DCore::QEntity();
         Qt3DCore::QEntity *parentNode = new Qt3DCore::QEntity();
         Qt3DCore::QEntity *leafNode = new Qt3DCore::QEntity();
-        grandParentNode->setObjectName("Green Grandparent");
-        parentNode->setObjectName("Green Parent");
-        leafNode->setObjectName("Green Leaf");
+        grandParentNode->setObjectName(QLatin1String("Green Grandparent"));
+        parentNode->setObjectName(QLatin1String("Green Parent"));
+        leafNode->setObjectName(QLatin1String("Green Leaf"));
 
-        leafNode->addComponent(renderer);
+        leafNode->addComponent(mesh);
         leafNode->addComponent(greenMaterial);
         parentNode->addComponent(leftTransform);
 
@@ -120,20 +117,20 @@ int main(int argc, char **argv)
     {
         Qt3DCore::QTransform *leftTransform = new Qt3DCore::QTransform;
         leftTransform->setTranslation(QVector3D(-5, 2, 0));
-        leftTransform->setObjectName("Yellow Transform");
+        leftTransform->setObjectName(QLatin1String("Yellow Transform"));
 
         Qt3DExtras::QPhongMaterial *yellowMaterial = new Qt3DExtras::QPhongMaterial(rootEntity);
-        yellowMaterial->setObjectName("Yellow Material");
+        yellowMaterial->setObjectName(QLatin1String("Yellow Material"));
         yellowMaterial->setDiffuse(Qt::yellow);
 
         Qt3DCore::QEntity *grandParentNode = new Qt3DCore::QEntity(rootEntity);
         Qt3DCore::QEntity *parentNode = new Qt3DCore::QEntity(rootEntity);
         Qt3DCore::QEntity *leafNode = new Qt3DCore::QEntity(rootEntity);
-        leafNode->setObjectName("Yellow Leaf");
-        grandParentNode->setObjectName("Yellow Grandparent");
-        parentNode->setObjectName("Yellow Parent");
+        leafNode->setObjectName(QLatin1String("Yellow Leaf"));
+        grandParentNode->setObjectName(QLatin1String("Yellow Grandparent"));
+        parentNode->setObjectName(QLatin1String("Yellow Parent"));
 
-        leafNode->addComponent(renderer);
+        leafNode->addComponent(mesh);
         leafNode->addComponent(yellowMaterial);
         parentNode->addComponent(leftTransform);
 
@@ -151,31 +148,31 @@ int main(int argc, char **argv)
         Qt3DCore::QNode *tree1node1 = new Qt3DCore::QNode();
         Qt3DCore::QEntity *tree1node2 = new Qt3DCore::QEntity();
         Qt3DCore::QNode *tree1node3 = new Qt3DCore::QNode();
-        tree1node1->setObjectName("Red Tree1-Node1");
-        tree1node2->setObjectName("Red Tree1-Node2");
-        tree1node3->setObjectName("Red Tree1-Node3");
+        tree1node1->setObjectName(QLatin1String("Red Tree1-Node1"));
+        tree1node2->setObjectName(QLatin1String("Red Tree1-Node2"));
+        tree1node3->setObjectName(QLatin1String("Red Tree1-Node3"));
 
         Qt3DCore::QNode *tree2node1 = new Qt3DCore::QNode();
         Qt3DCore::QEntity *tree2node2 = new Qt3DCore::QEntity();
         Qt3DCore::QNode *tree2node3 = new Qt3DCore::QNode();
-        tree2node1->setObjectName("Red Tree2-Node1");
-        tree2node2->setObjectName("Red Tree2-Node2");
-        tree2node3->setObjectName("Red Tree2-Node3");
+        tree2node1->setObjectName(QLatin1String("Red Tree2-Node1"));
+        tree2node2->setObjectName(QLatin1String("Red Tree2-Node2"));
+        tree2node3->setObjectName(QLatin1String("Red Tree2-Node3"));
 
         Qt3DCore::QTransform *wrongRedTransform = new Qt3DCore::QTransform;
         wrongRedTransform->setTranslation(QVector3D(1, -1, 0));
         Qt3DCore::QTransform *bottomRightTransform = new Qt3DCore::QTransform;
         bottomRightTransform->setTranslation(QVector3D(5, -2, 0));
-        bottomRightTransform->setObjectName("Red BR Transform");
-        wrongRedTransform->setObjectName("Red Wrong Transform");
+        bottomRightTransform->setObjectName(QLatin1String("Red BR Transform"));
+        wrongRedTransform->setObjectName(QLatin1String("Red Wrong Transform"));
 
         Qt3DExtras::QPhongMaterial *redMaterial = new Qt3DExtras::QPhongMaterial(rootEntity);
         redMaterial->setDiffuse(Qt::red);
-        redMaterial->setObjectName("Red Material");
+        redMaterial->setObjectName(QLatin1String("Red Material"));
 
         Qt3DCore::QEntity *leafNode = new Qt3DCore::QEntity();
-        leafNode->setObjectName("Red Leaf");
-        leafNode->addComponent(renderer);
+        leafNode->setObjectName(QLatin1String("Red Leaf"));
+        leafNode->addComponent(mesh);
         leafNode->addComponent(redMaterial);
 
         tree1node2->addComponent(wrongRedTransform);
@@ -199,31 +196,31 @@ int main(int argc, char **argv)
         Qt3DCore::QNode *tree1node1 = new Qt3DCore::QNode(rootEntity);
         Qt3DCore::QEntity *tree1node2 = new Qt3DCore::QEntity(rootEntity);
         Qt3DCore::QNode *tree1node3 = new Qt3DCore::QNode(rootEntity);
-        tree1node1->setObjectName("Blue Tree1-Node1");
-        tree1node2->setObjectName("Blue Tree1-Node2");
-        tree1node3->setObjectName("Blue Tree1-Node3");
+        tree1node1->setObjectName(QLatin1String("Blue Tree1-Node1"));
+        tree1node2->setObjectName(QLatin1String("Blue Tree1-Node2"));
+        tree1node3->setObjectName(QLatin1String("Blue Tree1-Node3"));
 
         Qt3DCore::QNode *tree2node1 = new Qt3DCore::QNode(rootEntity);
         Qt3DCore::QEntity *tree2node2 = new Qt3DCore::QEntity(rootEntity);
         Qt3DCore::QNode *tree2node3 = new Qt3DCore::QNode(rootEntity);
-        tree2node1->setObjectName("Blue Tree2-Node1");
-        tree2node2->setObjectName("Blue Tree2-Node2");
-        tree2node3->setObjectName("Blue Tree2-Node3");
+        tree2node1->setObjectName(QLatin1String("Blue Tree2-Node1"));
+        tree2node2->setObjectName(QLatin1String("Blue Tree2-Node2"));
+        tree2node3->setObjectName(QLatin1String("Blue Tree2-Node3"));
 
         Qt3DCore::QTransform *wrongBlueTransform = new Qt3DCore::QTransform;
         wrongBlueTransform->setTranslation(QVector3D(1, 1, 0));
         Qt3DCore::QTransform *topRightTransform = new Qt3DCore::QTransform;
         topRightTransform->setTranslation(QVector3D(5, 2, 0));
-        wrongBlueTransform->setObjectName("Blue Wrong Transform");
-        topRightTransform->setObjectName("Blue TR Transform");
+        wrongBlueTransform->setObjectName(QLatin1String("Blue Wrong Transform"));
+        topRightTransform->setObjectName(QLatin1String("Blue TR Transform"));
 
         Qt3DExtras::QPhongMaterial *blueMaterial = new Qt3DExtras::QPhongMaterial(rootEntity);
-        blueMaterial->setObjectName("Blue Material");
+        blueMaterial->setObjectName(QLatin1String("Blue Material"));
         blueMaterial->setDiffuse(Qt::blue);
         Qt3DCore::QEntity *leafNode = new Qt3DCore::QEntity(rootEntity);
-        leafNode->addComponent(renderer);
+        leafNode->addComponent(mesh);
         leafNode->addComponent(blueMaterial);
-        leafNode->setObjectName("Blue Leaf");
+        leafNode->setObjectName(QLatin1String("Blue Leaf"));
 
         // sometimes this can change things
         //QCoreApplication::processEvents();
diff --git a/tests/manual/cylinder-qml/main.qml b/tests/manual/cylinder-qml/main.qml
index e821479cb..a5df8af44 100644
--- a/tests/manual/cylinder-qml/main.qml
+++ b/tests/manual/cylinder-qml/main.qml
@@ -83,14 +83,12 @@ Entity {
 
     components: [external_forward_renderer, inputSettings]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 100
-            slices: 20
-        }
+        radius: 1
+        length: 3
+        rings: 100
+        slices: 20
     }
 
     Transform {
diff --git a/tests/manual/deferred-renderer-cpp/sceneentity.cpp b/tests/manual/deferred-renderer-cpp/sceneentity.cpp
index 98b83402d..3694b113e 100644
--- a/tests/manual/deferred-renderer-cpp/sceneentity.cpp
+++ b/tests/manual/deferred-renderer-cpp/sceneentity.cpp
@@ -58,9 +58,6 @@ SceneEntity::SceneEntity(Qt3DCore::QNode *parent)
     sphereMesh->setRings(50);
     sphereMesh->setSlices(100);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(sphereMesh);
-
     {
         Qt3DRender::QPointLight *light1 = new Qt3DRender::QPointLight(this);
         light1->setColor(Qt::white);
@@ -85,7 +82,7 @@ SceneEntity::SceneEntity(Qt3DCore::QNode *parent)
 
         sphereOne->addComponent(sphereOneTransform);
         sphereOne->addComponent(sphereOneMaterial);
-        sphereOne->addComponent(renderer);
+        sphereOne->addComponent(sphereMesh);
         sphereOne->addComponent(m_layer);
         sphereOne->addComponent(light2);
     }
@@ -100,7 +97,7 @@ SceneEntity::SceneEntity(Qt3DCore::QNode *parent)
         light3->setColor(Qt::blue);
         light3->setIntensity(0.5f);
 
-        sphereTwo->addComponent(renderer);
+        sphereTwo->addComponent(sphereMesh);
         sphereTwo->addComponent(m_layer);
         sphereTwo->addComponent(sphereTwoMaterial);
         sphereTwo->addComponent(light3);
diff --git a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp
index 507a22588..08f8c7346 100644
--- a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp
+++ b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp
@@ -64,13 +64,10 @@ ScreenQuadEntity::ScreenQuadEntity(Qt3DCore::QNode *parent)
     planeMesh->setWidth(2.0f);
     planeMesh->setHeight(2.0f);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(planeMesh);
-
     addComponent(m_layer);
     addComponent(screenPlaneTransform);
     addComponent(screenQuadMaterial);
-    addComponent(renderer);
+    addComponent(planeMesh);
 }
 
 Qt3DRender::QLayer *ScreenQuadEntity::layer() const
diff --git a/tests/manual/deferred-renderer-qml/GBufferDebugger.qml b/tests/manual/deferred-renderer-qml/GBufferDebugger.qml
index 423f9104d..7f148099e 100644
--- a/tests/manual/deferred-renderer-qml/GBufferDebugger.qml
+++ b/tests/manual/deferred-renderer-qml/GBufferDebugger.qml
@@ -47,12 +47,10 @@ Entity {
     components : [
         Layer { id: debugLayer },
 
-        GeometryRenderer {
-            view: PlaneMesh {
-                width: 2.0
-                height: 2.0
-                meshResolution: Qt.size(2, 2)
-            }
+        PlaneMesh {
+            width: 2.0
+            height: 2.0
+            meshResolution: Qt.size(2, 2)
         },
 
         Transform { // We rotate the plane so that it faces us
diff --git a/tests/manual/deferred-renderer-qml/SceneEntity.qml b/tests/manual/deferred-renderer-qml/SceneEntity.qml
index 03d9c0cb7..6a34be7fb 100644
--- a/tests/manual/deferred-renderer-qml/SceneEntity.qml
+++ b/tests/manual/deferred-renderer-qml/SceneEntity.qml
@@ -81,12 +81,10 @@ Entity {
         viewCenter: Qt.vector3d( 0.0, 0.0, 10.0 )
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id : sphereMesh
-        view: SphereMesh {
-            rings: 50
-            slices: 100
-        }
+        rings: 50
+        slices: 100
     }
 
     SceneEffect { id : sceneMaterialEffect }
diff --git a/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml b/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml
index af242c970..3dae2b79a 100644
--- a/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml
+++ b/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml
@@ -118,12 +118,10 @@ Entity {
         components : [
             Layer { id: screenQuadLayer },
 
-            GeometryRenderer {
-                view: PlaneMesh {
-                    width: 2.0
-                    height: 2.0
-                    meshResolution: Qt.size(2, 2)
-                }
+            PlaneMesh {
+                width: 2.0
+                height: 2.0
+                meshResolution: Qt.size(2, 2)
             },
 
             Transform { // We rotate the plane so that it faces us
diff --git a/tests/manual/dragging/main.qml b/tests/manual/dragging/main.qml
index c02fa594b..844b5066d 100644
--- a/tests/manual/dragging/main.qml
+++ b/tests/manual/dragging/main.qml
@@ -96,11 +96,9 @@ Entity {
         id: mainEntity
         objectName: "mainEntity"
 
-        GeometryRenderer {
+        ConeMesh {
             id: coneMesh
-            view: ConeMesh {
-                length: 4
-            }
+            length: 4
         }
 
         PhongMaterial {
@@ -124,14 +122,12 @@ Entity {
         objectName: "draggerEntity"
         property vector3d position: Qt.vector3d(0, 0, 0)
 
-        GeometryRenderer {
+        CylinderMesh {
             id: mesh
-            view: CylinderMesh {
-                radius: .5
-                length: 3
-                rings: 2
-                slices: 20
-            }
+            radius: .5
+            length: 3
+            rings: 2
+            slices: 20
         }
 
         Transform {
@@ -170,7 +166,7 @@ Entity {
         id: obstructionEntity
 
         components: [
-            GeometryRenderer { view: CuboidMesh { } },
+            CuboidMesh { },
             PhongMaterial { diffuse: "blue" },
             Transform {
                 scale: 2
diff --git a/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml b/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml
index a21c50237..d9b33c511 100644
--- a/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml
+++ b/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml
@@ -56,13 +56,11 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, phongMaterial, transform ]
 
-    GeometryRenderer {
+    CuboidMesh {
         id: mesh
-        view:  CuboidMesh {
-            yzMeshResolution: Qt.size(2, 2)
-            xzMeshResolution: Qt.size(2, 2)
-            xyMeshResolution: Qt.size(2, 2)
-        }
+        yzMeshResolution: Qt.size(2, 2)
+        xzMeshResolution: Qt.size(2, 2)
+        xyMeshResolution: Qt.size(2, 2)
     }
 
     GoochMaterial {
diff --git a/tests/manual/dynamic-model-loader-qml/SphereEntity.qml b/tests/manual/dynamic-model-loader-qml/SphereEntity.qml
index 14100f31f..8e11de99e 100644
--- a/tests/manual/dynamic-model-loader-qml/SphereEntity.qml
+++ b/tests/manual/dynamic-model-loader-qml/SphereEntity.qml
@@ -56,11 +56,9 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, material, transform ]
 
-    GeometryRenderer {
+    SphereMesh {
         id: mesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/dynamic-model-loader-qml/main.qml b/tests/manual/dynamic-model-loader-qml/main.qml
index a403d2829..dc6b929cf 100644
--- a/tests/manual/dynamic-model-loader-qml/main.qml
+++ b/tests/manual/dynamic-model-loader-qml/main.qml
@@ -128,9 +128,8 @@ Entity {
     QQ2.Component {
         id: cylEntityCmp
         Entity {
-            GeometryRenderer {
+            CylinderMesh {
                 id: cylMesh
-                view: CylinderMesh { }
             }
             PhongMaterial {
                 id: phong
@@ -143,14 +142,12 @@ Entity {
     QQ2.Component {
         id: torusEntityCmp
         Entity {
-            GeometryRenderer {
+            TorusMesh {
                 id: torusMesh
-                view: TorusMesh {
-                    radius: 5
-                    minorRadius: 1
-                    rings: 100
-                    slices: 20
-                }
+                radius: 5
+                minorRadius: 1
+                rings: 100
+                slices: 20
             }
 
             Transform {
diff --git a/tests/manual/dynamicscene-cpp/boxentity.cpp b/tests/manual/dynamicscene-cpp/boxentity.cpp
index 56b41c5f0..5952b04ec 100644
--- a/tests/manual/dynamicscene-cpp/boxentity.cpp
+++ b/tests/manual/dynamicscene-cpp/boxentity.cpp
@@ -67,11 +67,8 @@ BoxEntity::BoxEntity(QNode *parent)
     m_material->setSpecular(Qt::white);
     m_material->setShininess(150.0f);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(m_mesh);
-
     addComponent(m_transform);
-    addComponent(renderer);
+    addComponent(m_mesh);
     addComponent(m_material);
 }
 
diff --git a/tests/manual/enabled-qml/main.qml b/tests/manual/enabled-qml/main.qml
index 6191fde1b..8ee933eb6 100644
--- a/tests/manual/enabled-qml/main.qml
+++ b/tests/manual/enabled-qml/main.qml
@@ -111,11 +111,9 @@ Entity {
 
     // Sphere
     Entity {
-        GeometryRenderer {
+        SphereMesh {
             id: sphereMesh
-            view: SphereMesh {
-                enabled: counter !== 0
-            }
+            enabled: counter !== 0
         }
 
         PhongMaterial {
@@ -186,12 +184,10 @@ Entity {
 
     // Floor
     Entity {
-        GeometryRenderer {
+        PlaneMesh {
             id: planeMesh
-            view: PlaneMesh {
-                width: 25.0
-                height: 10
-            }
+            width: 25.0
+            height: 10
         }
 
         PhongMaterial {
diff --git a/tests/manual/keyboardinput-qml/SphereEntity.qml b/tests/manual/keyboardinput-qml/SphereEntity.qml
index 91f40230d..2b7b449d7 100644
--- a/tests/manual/keyboardinput-qml/SphereEntity.qml
+++ b/tests/manual/keyboardinput-qml/SphereEntity.qml
@@ -62,7 +62,7 @@ Entity {
 
     PhongMaterial { id: material }
 
-    GeometryRenderer { id: sphereMesh; view: SphereMesh { } }
+    SphereMesh { id: sphereMesh }
 
     Transform {
         id: transform
diff --git a/tests/manual/layerfilter-qml/main.qml b/tests/manual/layerfilter-qml/main.qml
index acc4dae08..c883d5745 100644
--- a/tests/manual/layerfilter-qml/main.qml
+++ b/tests/manual/layerfilter-qml/main.qml
@@ -148,12 +148,10 @@ Entity {
 
     components: [external_forward_renderer, inputSettings]
 
-    GeometryRenderer {
+    PlaneMesh {
         id: backgroundMesh
-        view: PlaneMesh {
-            width: 0.5
-            height: 0.5
-        }
+        width: 0.5
+        height: 0.5
     }
 
     Transform {
diff --git a/tests/manual/loader-qml/CuboidEntity.qml b/tests/manual/loader-qml/CuboidEntity.qml
index 580daa94b..d9b33c511 100644
--- a/tests/manual/loader-qml/CuboidEntity.qml
+++ b/tests/manual/loader-qml/CuboidEntity.qml
@@ -56,13 +56,11 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, phongMaterial, transform ]
 
-    GeometryRenderer {
+    CuboidMesh {
         id: mesh
-        view: CuboidMesh {
-            yzMeshResolution: Qt.size(2, 2)
-            xzMeshResolution: Qt.size(2, 2)
-            xyMeshResolution: Qt.size(2, 2)
-        }
+        yzMeshResolution: Qt.size(2, 2)
+        xzMeshResolution: Qt.size(2, 2)
+        xyMeshResolution: Qt.size(2, 2)
     }
 
     GoochMaterial {
diff --git a/tests/manual/loader-qml/SphereEntity.qml b/tests/manual/loader-qml/SphereEntity.qml
index 14100f31f..8e11de99e 100644
--- a/tests/manual/loader-qml/SphereEntity.qml
+++ b/tests/manual/loader-qml/SphereEntity.qml
@@ -56,11 +56,9 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, material, transform ]
 
-    GeometryRenderer {
+    SphereMesh {
         id: mesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/loader-qml/main.qml b/tests/manual/loader-qml/main.qml
index 276883103..272331911 100644
--- a/tests/manual/loader-qml/main.qml
+++ b/tests/manual/loader-qml/main.qml
@@ -87,14 +87,12 @@ Entity {
         diffuse: "yellow"
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
diff --git a/tests/manual/lod/ConeEntity.qml b/tests/manual/lod/ConeEntity.qml
index d80834bcf..bfe6703b6 100644
--- a/tests/manual/lod/ConeEntity.qml
+++ b/tests/manual/lod/ConeEntity.qml
@@ -56,12 +56,10 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, phongMaterial, transform ]
 
-    GeometryRenderer {
-        view: ConeMesh {
-            id: mesh
-            bottomRadius: 1.5
-            length: 3
-        }
+    ConeMesh {
+        id: mesh
+        bottomRadius: 1.5
+        length: 3
     }
 
     PhongMaterial {
diff --git a/tests/manual/lod/CuboidEntity.qml b/tests/manual/lod/CuboidEntity.qml
index 2b8acbabf..875d98b32 100644
--- a/tests/manual/lod/CuboidEntity.qml
+++ b/tests/manual/lod/CuboidEntity.qml
@@ -56,13 +56,11 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, phongMaterial, transform ]
 
-    GeometryRenderer {
+    CuboidMesh {
         id: mesh
-        view: CuboidMesh {
-            yzMeshResolution: Qt.size(2, 2)
-            xzMeshResolution: Qt.size(2, 2)
-            xyMeshResolution: Qt.size(2, 2)
-        }
+        yzMeshResolution: Qt.size(2, 2)
+        xzMeshResolution: Qt.size(2, 2)
+        xyMeshResolution: Qt.size(2, 2)
     }
 
     PhongMaterial {
diff --git a/tests/manual/lod/CylinderEntity.qml b/tests/manual/lod/CylinderEntity.qml
index 3066f7b75..f89bd3eeb 100644
--- a/tests/manual/lod/CylinderEntity.qml
+++ b/tests/manual/lod/CylinderEntity.qml
@@ -56,12 +56,10 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, phongMaterial, transform ]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-        }
+        radius: 1
+        length: 3
     }
 
     PhongMaterial {
diff --git a/tests/manual/lod/SphereEntity.qml b/tests/manual/lod/SphereEntity.qml
index 7e3df2cc3..3671921b8 100644
--- a/tests/manual/lod/SphereEntity.qml
+++ b/tests/manual/lod/SphereEntity.qml
@@ -56,11 +56,9 @@ import Qt3D.Extras 2.0
 Entity {
     components: [ mesh, material, transform ]
 
-    GeometryRenderer {
+    SphereMesh {
         id: mesh
-        SphereMesh {
-            radius: 1
-        }
+        radius: 1
     }
 
     PhongMaterial {
diff --git a/tests/manual/lod/main.qml b/tests/manual/lod/main.qml
index 98cbc7aaa..80547dcff 100644
--- a/tests/manual/lod/main.qml
+++ b/tests/manual/lod/main.qml
@@ -104,16 +104,14 @@ Entity {
 
         Entity {
             components: [
-                GeometryRenderer {
+                CylinderMesh {
                     id: mesh
-                    view: CylinderMesh {
-                        radius: 1
-                        length: 3
-                        rings: 2
-                        slices: sliceValues[lod.currentIndex]
-
-                        property var sliceValues: [20, 10, 6, 4]
-                    }
+                    radius: 1
+                    length: 3
+                    rings: 2
+                    slices: sliceValues[lod.currentIndex]
+
+                    property var sliceValues: [20, 10, 6, 4]
                 },
                 Transform {
                     scale: 1.5
diff --git a/tests/manual/manual-renderloop/main.cpp b/tests/manual/manual-renderloop/main.cpp
index b8382fde2..024693a90 100644
--- a/tests/manual/manual-renderloop/main.cpp
+++ b/tests/manual/manual-renderloop/main.cpp
@@ -130,9 +130,7 @@ private:
         torusTransform->setScale3D(QVector3D(1.5, 1, 0.5));
         torusTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f));
 
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(torusMesh);
-        torusEntity->addComponent(renderer);
+        torusEntity->addComponent(torusMesh);
         torusEntity->addComponent(material);
         torusEntity->addComponent(torusTransform);
 
diff --git a/tests/manual/mesh-morphing/main.cpp b/tests/manual/mesh-morphing/main.cpp
index 79f6eee60..489ac196f 100644
--- a/tests/manual/mesh-morphing/main.cpp
+++ b/tests/manual/mesh-morphing/main.cpp
@@ -120,11 +120,8 @@ int main(int argc, char **argv)
     Qt3DAnimation::QVertexBlendAnimation *animation = new Qt3DAnimation::QVertexBlendAnimation;
     const QList<float> times = { 0.0f, 5.0f, 8.0f, 12.0f };
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(mesh);
-
     animation->setTargetPositions(times);
-    animation->setTarget(renderer);
+    animation->setTarget(mesh);
     animation->setMorphTargets(morphTargets);
 
     // Material
@@ -136,7 +133,7 @@ int main(int argc, char **argv)
 
     // Cylinder
     Qt3DCore::QEntity *morphingEntity = new Qt3DCore::QEntity(rootEntity);
-    morphingEntity->addComponent(renderer);
+    morphingEntity->addComponent(mesh);
     morphingEntity->addComponent(transform);
     morphingEntity->addComponent(material);
 
@@ -157,11 +154,8 @@ int main(int argc, char **argv)
     cylinderMaterial->setDiffuse(Qt::red);
 
     // Cylinder
-    renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(cylinderMesh);
-
     Qt3DCore::QEntity *cylinder = new Qt3DCore::QEntity(rootEntity);
-    cylinder->addComponent(renderer);
+    cylinder->addComponent(cylinderMesh);
     cylinder->addComponent(cylinderTransform);
     cylinder->addComponent(cylinderMaterial);
 
diff --git a/tests/manual/mouseinput-qml/main.qml b/tests/manual/mouseinput-qml/main.qml
index e0cc8f73e..38ad847ed 100644
--- a/tests/manual/mouseinput-qml/main.qml
+++ b/tests/manual/mouseinput-qml/main.qml
@@ -81,11 +81,9 @@ Entity {
         InputSettings {}
     ]
 
-    GeometryRenderer{
+    SphereMesh{
         id: sphereMesh
-        SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     PhongMaterial {
diff --git a/tests/manual/multiplewindows-qml/Scene.qml b/tests/manual/multiplewindows-qml/Scene.qml
index 89fd2794d..06107667d 100644
--- a/tests/manual/multiplewindows-qml/Scene.qml
+++ b/tests/manual/multiplewindows-qml/Scene.qml
@@ -99,14 +99,12 @@ Entity {
         id: material
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
@@ -120,11 +118,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/paintedtexture-cpp/scene.cpp b/tests/manual/paintedtexture-cpp/scene.cpp
index 83ba172f7..e5ef6730f 100644
--- a/tests/manual/paintedtexture-cpp/scene.cpp
+++ b/tests/manual/paintedtexture-cpp/scene.cpp
@@ -123,12 +123,9 @@ Scene::Scene(Qt3DCore::QEntity *rootEntity)
     mat->setSpecular(QColor(255, 255, 255));
     mat->setDiffuse(tex);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(cuboid);
-
     //Cuboid
     m_cuboidEntity = new Qt3DCore::QEntity(m_rootEntity);
-    m_cuboidEntity->addComponent(renderer);
+    m_cuboidEntity->addComponent(cuboid);
     m_cuboidEntity->addComponent(mat);
     m_cuboidEntity->addComponent(m_transform);
 
diff --git a/tests/manual/picking-qml/main.qml b/tests/manual/picking-qml/main.qml
index 8de39a66f..10f6a76e8 100644
--- a/tests/manual/picking-qml/main.qml
+++ b/tests/manual/picking-qml/main.qml
@@ -152,7 +152,7 @@ Entity {
         InputSettings {}
     ]
 
-    GeometryRenderer { id: cubeMesh; view: CuboidMesh { } }
+    CuboidMesh { id: cubeMesh }
 
     PickableEntity {
         id: cube1
@@ -260,7 +260,7 @@ Entity {
         }
         readonly property PhongMaterial material: PhongMaterial { diffuse: "yellow" }
 
-        readonly property GeometryRenderer sphereMesh: GeometryRenderer { view: SphereMesh { } }
+        readonly property GeometryRenderer sphereMesh: SphereMesh {  }
 
         components: [sphereMesh, transform, material, sceneRoot.contentLayer, objectPicker]
     }
@@ -288,7 +288,7 @@ Entity {
         }
         readonly property PhongMaterial material: PhongMaterial { diffuse: "green" }
 
-        readonly property GeometryRenderer sphereMesh: GeometryRenderer { view: SphereMesh { } }
+        readonly property GeometryRenderer sphereMesh: SphereMesh {  }
 
         components: [sphereMesh, transform, material, sceneRoot.contentLayer, objectPicker, pickingProxy]
     }
diff --git a/tests/manual/plasma/main.qml b/tests/manual/plasma/main.qml
index f93970405..0a01f699b 100644
--- a/tests/manual/plasma/main.qml
+++ b/tests/manual/plasma/main.qml
@@ -60,12 +60,10 @@ Entity {
 
     Entity {
         components: [
-            GeometryRenderer {
-                view: PlaneMesh {
-                    width: 2.0
-                    height: 2.0
-                    meshResolution: Qt.size(2, 2)
-                }
+            PlaneMesh {
+                width: 2.0
+                height: 2.0
+                meshResolution: Qt.size(2, 2)
             },
 
             Transform { // Rotate the plane so that it faces us
diff --git a/tests/manual/proximityfilter/main.qml b/tests/manual/proximityfilter/main.qml
index ec66f8e5d..d55d3a90e 100644
--- a/tests/manual/proximityfilter/main.qml
+++ b/tests/manual/proximityfilter/main.qml
@@ -99,9 +99,8 @@ Entity {
         InputSettings { }
     ]
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh { }
     }
 
     PhongMaterial {
diff --git a/tests/manual/qtbug-72236/main.cpp b/tests/manual/qtbug-72236/main.cpp
index 06313c122..2bf90c03f 100644
--- a/tests/manual/qtbug-72236/main.cpp
+++ b/tests/manual/qtbug-72236/main.cpp
@@ -114,12 +114,9 @@ int main(int argc, char **argv)
     Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity);
     material->setDiffuse(Qt::red);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(mesh);
-
     // Cylinder
     Qt3DCore::QEntity *cylinder = new Qt3DCore::QEntity(rootEntity);
-    cylinder->addComponent(renderer);
+    cylinder->addComponent(mesh);
     cylinder->addComponent(transform);
     cylinder->addComponent(material);
 
diff --git a/tests/manual/qtbug-76766/PostProcess.qml b/tests/manual/qtbug-76766/PostProcess.qml
index 3e9218451..cd4c9c0c6 100644
--- a/tests/manual/qtbug-76766/PostProcess.qml
+++ b/tests/manual/qtbug-76766/PostProcess.qml
@@ -103,13 +103,11 @@ Entity {
         effect: materialEffect
     }
 
-    GeometryRenderer {
+    PlaneMesh {
         id: planeMesh
-        view: PlaneMesh {
-            width: 2.0
-            height: 2.0
-            meshResolution: Qt.size(2, 2)
-        }
+        width: 2.0
+        height: 2.0
+        meshResolution: Qt.size(2, 2)
     }
 
     components : [
diff --git a/tests/manual/qtbug-76766/SceneRoot.qml b/tests/manual/qtbug-76766/SceneRoot.qml
index 93e96a43d..d05c54cf4 100644
--- a/tests/manual/qtbug-76766/SceneRoot.qml
+++ b/tests/manual/qtbug-76766/SceneRoot.qml
@@ -111,7 +111,7 @@ Entity {
                 Material1 {
                     color: "red"
                 },
-                GeometryRenderer { view: SphereMesh { } }
+                SphereMesh { }
             ]
         }
 
@@ -124,7 +124,7 @@ Entity {
                 Material2 {
                     color: "green"
                 },
-                GeometryRenderer { view: SphereMesh { } }
+                SphereMesh { }
             ]
         }
     }
@@ -147,7 +147,7 @@ Entity {
                         loops: Animation.Infinite
                     }
                 },
-                GeometryRenderer { view: SphereMesh { } }
+                SphereMesh { }
             ]
         }
 
@@ -161,7 +161,7 @@ Entity {
                 Material2 {
                     color: "orange"
                 },
-                GeometryRenderer { view: SphereMesh { } }
+                SphereMesh { }
             ]
         }
     }
diff --git a/tests/manual/raster-cpp/main.cpp b/tests/manual/raster-cpp/main.cpp
index 4f902cad8..2eaeea6ec 100644
--- a/tests/manual/raster-cpp/main.cpp
+++ b/tests/manual/raster-cpp/main.cpp
@@ -117,12 +117,9 @@ int main(int argc, char **argv)
     Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity);
     material->setDiffuse(Qt::red);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(mesh);
-
     // Cylinder
     Qt3DCore::QEntity *cylinder = new Qt3DCore::QEntity(rootEntity);
-    cylinder->addComponent(renderer);
+    cylinder->addComponent(mesh);
     cylinder->addComponent(transform);
     cylinder->addComponent(material);
 
diff --git a/tests/manual/raster-qml/main.qml b/tests/manual/raster-qml/main.qml
index 35d414771..91fc288d0 100644
--- a/tests/manual/raster-qml/main.qml
+++ b/tests/manual/raster-qml/main.qml
@@ -90,14 +90,12 @@ Entity {
 
     components: [external_forward_renderer, inputSettings]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 100
-            slices: 20
-        }
+        radius: 1
+        length: 3
+        rings: 100
+        slices: 20
     }
 
     Transform {
diff --git a/tests/manual/raycasting-qml/CylinderEntity.qml b/tests/manual/raycasting-qml/CylinderEntity.qml
index 08fed9434..4bae3c207 100644
--- a/tests/manual/raycasting-qml/CylinderEntity.qml
+++ b/tests/manual/raycasting-qml/CylinderEntity.qml
@@ -61,14 +61,12 @@ Entity {
 
     components: [ mesh, material, transform ]
 
-    GeometryRenderer {
+    CylinderMesh {
         id: mesh
-        view: CylinderMesh {
-            radius: 1
-            length: 3
-            rings: 100
-            slices: 20
-        }
+        radius: 1
+        length: 3
+        rings: 100
+        slices: 20
     }
 
     Transform {
diff --git a/tests/manual/render-qml-to-texture-qml/main.qml b/tests/manual/render-qml-to-texture-qml/main.qml
index 047906973..38a0259ee 100644
--- a/tests/manual/render-qml-to-texture-qml/main.qml
+++ b/tests/manual/render-qml-to-texture-qml/main.qml
@@ -116,13 +116,11 @@ QQ2.Item {
                 InputSettings {}
             ]
 
-            GeometryRenderer {
+            PlaneMesh {
                 id: planeMesh
-                view: PlaneMesh {
-                    width: 4
-                    height: 4
-                    mirrored: true
-                }
+                width: 4
+                height: 4
+                mirrored: true
             }
 
             Entity {
diff --git a/tests/manual/render-qml-to-texture/main.cpp b/tests/manual/render-qml-to-texture/main.cpp
index 880b1b8cb..284514827 100644
--- a/tests/manual/render-qml-to-texture/main.cpp
+++ b/tests/manual/render-qml-to-texture/main.cpp
@@ -113,9 +113,7 @@ int main(int argc, char *argv[])
     Qt3DExtras::QPlaneMesh* planeMesh = new Qt3DExtras::QPlaneMesh(planeEntity);
     planeMesh->setWidth(4);
     planeMesh->setHeight(4);
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(planeMesh);
-    planeEntity->addComponent(renderer);
+    planeEntity->addComponent(planeMesh);
 
     PlaneMaterial* material = new PlaneMaterial(offscreenTexture, planeEntity);
     planeEntity->addComponent(material);
diff --git a/tests/manual/rendercapture-cpp/main.cpp b/tests/manual/rendercapture-cpp/main.cpp
index ac8d74787..da03fa7d6 100644
--- a/tests/manual/rendercapture-cpp/main.cpp
+++ b/tests/manual/rendercapture-cpp/main.cpp
@@ -95,9 +95,7 @@ Qt3DCore::QEntity *createScene()
     torusTransform->setScale3D(QVector3D(1.5, 1, 0.5));
     torusTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f));
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(torusMesh);
-    torusEntity->addComponent(renderer);
+    torusEntity->addComponent(torusMesh);
     torusEntity->addComponent(torusTransform);
     torusEntity->addComponent(material);
 
@@ -120,10 +118,7 @@ Qt3DCore::QEntity *createScene()
     sphereRotateTransformAnimation->setLoopCount(-1);
     sphereRotateTransformAnimation->start();
 
-    renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(sphereMesh);
-
-    sphereEntity->addComponent(renderer);
+    sphereEntity->addComponent(sphereMesh);
     sphereEntity->addComponent(sphereTransform);
     sphereEntity->addComponent(material);
 
diff --git a/tests/manual/rendercapture-qml-fbo/CaptureScene.qml b/tests/manual/rendercapture-qml-fbo/CaptureScene.qml
index ad1fae793..9c6cb1431 100644
--- a/tests/manual/rendercapture-qml-fbo/CaptureScene.qml
+++ b/tests/manual/rendercapture-qml-fbo/CaptureScene.qml
@@ -157,14 +157,12 @@ Entity {
         id: material
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
@@ -178,11 +176,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/rendercapture-qml/CaptureScene.qml b/tests/manual/rendercapture-qml/CaptureScene.qml
index 0ebfaf5be..ea355042a 100644
--- a/tests/manual/rendercapture-qml/CaptureScene.qml
+++ b/tests/manual/rendercapture-qml/CaptureScene.qml
@@ -96,14 +96,12 @@ Entity {
         id: material
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
@@ -117,11 +115,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/rendertarget-cpp/main.cpp b/tests/manual/rendertarget-cpp/main.cpp
index 7e621a591..601392011 100644
--- a/tests/manual/rendertarget-cpp/main.cpp
+++ b/tests/manual/rendertarget-cpp/main.cpp
@@ -224,9 +224,7 @@ Qt3DCore::QEntity *createScene(const Renderer& renderer)
         torusTransform->setScale3D(QVector3D(1.5, 1, 0.5));
         torusTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f));
 
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(torusMesh);
-        torusEntity->addComponent(renderer);
+        torusEntity->addComponent(torusMesh);
         torusEntity->addComponent(torusTransform);
         torusEntity->addComponent(childMaterial);
 
@@ -250,10 +248,7 @@ Qt3DCore::QEntity *createScene(const Renderer& renderer)
         sphereRotateTransformAnimation->setLoopCount(-1);
         sphereRotateTransformAnimation->start();
 
-        renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(sphereMesh);
-
-        sphereEntity->addComponent(renderer);
+        sphereEntity->addComponent(sphereMesh);
         sphereEntity->addComponent(sphereTransform);
         sphereEntity->addComponent(childMaterial);
     }
@@ -266,14 +261,12 @@ Qt3DCore::QEntity *createScene(const Renderer& renderer)
         auto cubeMesh = new Qt3DExtras::QCuboidMesh;
         auto sphereTransform = new Qt3DCore::QTransform;
         sphereTransform->setRotationY(100);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(cubeMesh);
 
         cubeMesh->setXExtent(10);
         cubeMesh->setYExtent(10);
         cubeMesh->setZExtent(10);
 
-        sphereEntity->addComponent(renderer);
+        sphereEntity->addComponent(cubeMesh);
         sphereEntity->addComponent(sphereTransform);
         sphereEntity->addComponent(mainMaterial);
     }
diff --git a/tests/manual/scene3d-in-sync/main.qml b/tests/manual/scene3d-in-sync/main.qml
index 45b68dcb7..31d4096a7 100644
--- a/tests/manual/scene3d-in-sync/main.qml
+++ b/tests/manual/scene3d-in-sync/main.qml
@@ -113,12 +113,10 @@ Item {
                 Entity {
                     id: trackingCube
                     components: [
-                        GeometryRenderer {
-                            view: CuboidMesh {
-                                xExtent: 100
-                                yExtent: 100
-                                zExtent: 2
-                            }
+                        CuboidMesh {
+                            xExtent: 100
+                            yExtent: 100
+                            zExtent: 2
                         },
 
                         PhongMaterial {
diff --git a/tests/manual/scene3d-loader/AnimatedEntity.qml b/tests/manual/scene3d-loader/AnimatedEntity.qml
index 5c406dbf6..0f6b7da1a 100644
--- a/tests/manual/scene3d-loader/AnimatedEntity.qml
+++ b/tests/manual/scene3d-loader/AnimatedEntity.qml
@@ -84,14 +84,12 @@ Entity {
         id: material
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
@@ -105,11 +103,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/scene3d-loader/Scene2.qml b/tests/manual/scene3d-loader/Scene2.qml
index ee6aabe58..072d8f798 100644
--- a/tests/manual/scene3d-loader/Scene2.qml
+++ b/tests/manual/scene3d-loader/Scene2.qml
@@ -83,14 +83,12 @@ Scene3D {
 
         components: [renderSettings]
 
-        GeometryRenderer {
+        TorusMesh {
             id: torusMesh
-            view: TorusMesh {
-                radius: 5
-                minorRadius: 1
-                rings: 100
-                slices: 20
-            }
+            radius: 5
+            minorRadius: 1
+            rings: 100
+            slices: 20
         }
 
         Transform {
diff --git a/tests/manual/scene3d-visibility/main.qml b/tests/manual/scene3d-visibility/main.qml
index f7a49a8b3..ccfa3227f 100644
--- a/tests/manual/scene3d-visibility/main.qml
+++ b/tests/manual/scene3d-visibility/main.qml
@@ -106,21 +106,17 @@ Item {
                 id: material
             }
 
-            GeometryRenderer {
+            TorusMesh {
                 id: torusMesh
-                view: TorusMesh {
-                    radius: 5
-                    minorRadius: 1
-                    rings: 100
-                    slices: 20
-                }
+                radius: 5
+                minorRadius: 1
+                rings: 100
+                slices: 20
             }
 
-            GeometryRenderer {
+            SphereMesh {
                 id: sphereMesh
-                view: SphereMesh {
-                    radius: 3
-                }
+                radius: 3
             }
 
             Transform {
diff --git a/tests/manual/shader-image-qml/main.qml b/tests/manual/shader-image-qml/main.qml
index 960b10e0e..3ed71a892 100644
--- a/tests/manual/shader-image-qml/main.qml
+++ b/tests/manual/shader-image-qml/main.qml
@@ -200,9 +200,8 @@ Entity {
 
     // Preview Texture Scene
     Entity {
-        GeometryRenderer {
+        PlaneMesh {
             id: planeMesh
-            view: PlaneMesh {  }
         }
 
         components: Transform {
diff --git a/tests/manual/shared_texture_image/main.qml b/tests/manual/shared_texture_image/main.qml
index b21a07bb9..4d5f15742 100644
--- a/tests/manual/shared_texture_image/main.qml
+++ b/tests/manual/shared_texture_image/main.qml
@@ -93,7 +93,7 @@ Entity {
         source: "qrc:/image.png"
     }
 
-    readonly property GeometryRenderer mesh: GeometryRenderer { view: CuboidMesh {} }
+    readonly property GeometryRenderer mesh: CuboidMesh { }
 
     Entity {
         id: leftCube
diff --git a/tests/manual/sharedtexture/main.cpp b/tests/manual/sharedtexture/main.cpp
index c4b0df9ca..b4e5b57a8 100644
--- a/tests/manual/sharedtexture/main.cpp
+++ b/tests/manual/sharedtexture/main.cpp
@@ -98,10 +98,7 @@ Qt3DCore::QEntity *createScene(Qt3DExtras::Qt3DWindow *view, Qt3DRender::QAbstra
     cubeRotateTransformAnimation->setLoopCount(-1);
     cubeRotateTransformAnimation->start();
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(cuboidMesh);
-
-    sphereEntity->addComponent(renderer);
+    sphereEntity->addComponent(cuboidMesh);
     sphereEntity->addComponent(transform);
     sphereEntity->addComponent(material);
 
diff --git a/tests/manual/sharedtextureqml/main.qml b/tests/manual/sharedtextureqml/main.qml
index 5db5b1ea1..4eea4c752 100644
--- a/tests/manual/sharedtextureqml/main.qml
+++ b/tests/manual/sharedtextureqml/main.qml
@@ -115,7 +115,7 @@ Item {
 
             Entity {
                 id: cubeEntity
-                readonly property GeometryRenderer cuboid: GeometryRenderer { view: CuboidMesh {} }
+                readonly property GeometryRenderer cuboid: CuboidMesh { }
                 readonly property DiffuseMapMaterial material: DiffuseMapMaterial {
                     diffuse: shaderGLTexture
                 }
diff --git a/tests/manual/simple-shaders-qml/main.qml b/tests/manual/simple-shaders-qml/main.qml
index d45ff4cdb..38758d500 100644
--- a/tests/manual/simple-shaders-qml/main.qml
+++ b/tests/manual/simple-shaders-qml/main.qml
@@ -82,14 +82,12 @@ Entity {
         InputSettings { }
     ]
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Entity {
diff --git a/tests/manual/skybox/Skybox.qml b/tests/manual/skybox/Skybox.qml
index e2c9b6b68..f8a77bd65 100644
--- a/tests/manual/skybox/Skybox.qml
+++ b/tests/manual/skybox/Skybox.qml
@@ -86,13 +86,11 @@ Entity {
         fragmentShaderCode: loadSource("qrc:/shaders/es2/skybox.frag")
     }
 
-    GeometryRenderer {
+    CuboidMesh {
         id: cuboidMesh
-        view: CuboidMesh {
-            yzMeshResolution: Qt.size(2, 2)
-            xzMeshResolution: Qt.size(2, 2)
-            xyMeshResolution: Qt.size(2, 2)
-        }
+        yzMeshResolution: Qt.size(2, 2)
+        xzMeshResolution: Qt.size(2, 2)
+        xyMeshResolution: Qt.size(2, 2)
     }
 
     Transform {
diff --git a/tests/manual/skybox/main.qml b/tests/manual/skybox/main.qml
index 69c837121..af476a1ca 100644
--- a/tests/manual/skybox/main.qml
+++ b/tests/manual/skybox/main.qml
@@ -91,7 +91,7 @@ Entity {
 
     Entity {
         components: [
-            GeometryRenderer { view: SphereMesh { radius: 5 } },
+            SphereMesh { radius: 5 },
             PhongMaterial { diffuse: "dodgerblue" }
         ]
     }
diff --git a/tests/manual/subtree-enabler-qml/main.qml b/tests/manual/subtree-enabler-qml/main.qml
index 03c9beff6..226c2a84a 100644
--- a/tests/manual/subtree-enabler-qml/main.qml
+++ b/tests/manual/subtree-enabler-qml/main.qml
@@ -102,8 +102,8 @@ Entity {
                 Transform {
                     rotation: fromAxisAndAngle(Qt.vector3d(0, 0, 1), -sceneRoot.rotationAngle)
                 },
-                GeometryRenderer { view: CylinderMesh {} },
-                MetalRoughMaterial {}
+                CylinderMesh { },
+                MetalRoughMaterial { }
             ]
         }
     } // sceneRoot
diff --git a/tests/manual/texture-updates-cpp/scene.cpp b/tests/manual/texture-updates-cpp/scene.cpp
index 65277227c..a68052653 100644
--- a/tests/manual/texture-updates-cpp/scene.cpp
+++ b/tests/manual/texture-updates-cpp/scene.cpp
@@ -86,12 +86,9 @@ Scene::Scene(Qt3DCore::QEntity *rootEntity)
     mat->setSpecular(QColor(255, 255, 255));
     mat->setDiffuse(m_texture);
 
-    auto renderer = new Qt3DRender::QGeometryRenderer();
-    renderer->setView(cuboid);
-
     //Cuboid
     m_cuboidEntity = new Qt3DCore::QEntity(m_rootEntity);
-    m_cuboidEntity->addComponent(renderer);
+    m_cuboidEntity->addComponent(cuboid);
     m_cuboidEntity->addComponent(mat);
     m_cuboidEntity->addComponent(m_transform);
 }
diff --git a/tests/manual/texture_property_updates/main.qml b/tests/manual/texture_property_updates/main.qml
index 4ea241f63..7794dab55 100644
--- a/tests/manual/texture_property_updates/main.qml
+++ b/tests/manual/texture_property_updates/main.qml
@@ -131,7 +131,7 @@ QQ2.Item {
                 InputSettings { }
             ]
 
-            GeometryRenderer {  id: mesh; view: CuboidMesh { } }
+            CuboidMesh { id: mesh }
 
             NodeInstantiator {
                 id: instantiator
diff --git a/tests/manual/transparency-qml-scene3d/Scene.qml b/tests/manual/transparency-qml-scene3d/Scene.qml
index 94801d8ed..43d49dc54 100644
--- a/tests/manual/transparency-qml-scene3d/Scene.qml
+++ b/tests/manual/transparency-qml-scene3d/Scene.qml
@@ -103,21 +103,17 @@ Entity {
         extension: ".webp"
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/transparency-qml/main.qml b/tests/manual/transparency-qml/main.qml
index 3c7d8fd07..6d2b20fe8 100644
--- a/tests/manual/transparency-qml/main.qml
+++ b/tests/manual/transparency-qml/main.qml
@@ -98,21 +98,17 @@ Entity {
         components: [transform, light]
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/tests/manual/video-texture-qml/main.qml b/tests/manual/video-texture-qml/main.qml
index 1a31dae2f..93110ef2a 100644
--- a/tests/manual/video-texture-qml/main.qml
+++ b/tests/manual/video-texture-qml/main.qml
@@ -109,9 +109,8 @@ Entity {
         InputSettings {}
     ]
 
-    GeometryRenderer {
+    CuboidMesh {
         id: mesh
-        view: CuboidMesh { }
     }
 
     Entity {