From 5bf4f93fcb8ff16aeadf55644be351c9989ab5b2 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Tue, 11 Feb 2020 14:14:30 +0000
Subject: Make default geometries views

In Extras, make QTorusMesh and others a QGeometryView rather than
a QGeometryRenderer. Requires changes to scene graphs here and there
but going forward there simple shapes could be used as proxies for
picking or collision detection, etc.

Change-Id: Id488e064080dfd303e448aba11e6b242236b81d4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 tests/manual/qtbug-76766/PostProcess.qml | 10 ++++++----
 tests/manual/qtbug-76766/SceneRoot.qml   | 12 ++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'tests/manual/qtbug-76766')

diff --git a/tests/manual/qtbug-76766/PostProcess.qml b/tests/manual/qtbug-76766/PostProcess.qml
index cd4c9c0c6..3e9218451 100644
--- a/tests/manual/qtbug-76766/PostProcess.qml
+++ b/tests/manual/qtbug-76766/PostProcess.qml
@@ -103,11 +103,13 @@ Entity {
         effect: materialEffect
     }
 
-    PlaneMesh {
+    GeometryRenderer {
         id: planeMesh
-        width: 2.0
-        height: 2.0
-        meshResolution: Qt.size(2, 2)
+        view: PlaneMesh {
+            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 6e34633b1..93e96a43d 100644
--- a/tests/manual/qtbug-76766/SceneRoot.qml
+++ b/tests/manual/qtbug-76766/SceneRoot.qml
@@ -111,8 +111,7 @@ Entity {
                 Material1 {
                     color: "red"
                 },
-                SphereMesh {
-                }
+                GeometryRenderer { view: SphereMesh { } }
             ]
         }
 
@@ -125,8 +124,7 @@ Entity {
                 Material2 {
                     color: "green"
                 },
-                SphereMesh {
-                }
+                GeometryRenderer { view: SphereMesh { } }
             ]
         }
     }
@@ -149,8 +147,7 @@ Entity {
                         loops: Animation.Infinite
                     }
                 },
-                SphereMesh {
-                }
+                GeometryRenderer { view: SphereMesh { } }
             ]
         }
 
@@ -164,8 +161,7 @@ Entity {
                 Material2 {
                     color: "orange"
                 },
-                SphereMesh {
-                }
+                GeometryRenderer { view: SphereMesh { } }
             ]
         }
     }
-- 
cgit v1.2.3