Merge branch '5.6' into dev

Conflicts:
	examples/qt3d/qgltf/main.qml

Change-Id: I03d4cc679a7812fb114461609e481d43a0bc5390

4 files changed, 40 insertions, 35 deletions

diff --git a/examples/qt3d/qgltf/Wine.qml b/examples/qt3d/qgltf/Scene.qml
index b24e9de3f..e6d0e7dd8 100644
--- a/examples/qt3d/qgltf/Wine.qml
+++ b/examples/qt3d/qgltf/Scene.qml
@@ -40,21 +40,34 @@ import Qt3D.Render 2.0
 Entity {
     id: root
 
-    property vector3d position: Qt.vector3d(0, 0, 0)
-    property real angleX: 0
-    property real angleY: 0
-    property real angleZ: 0
-    property real scale: 1
+    Entity {
+        components: [
+            Transform {
+                translation: Qt.vector3d(-30, 0, 0)
+                rotation: fromEulerAngles(-90, 180, 0)
+            },
+            SceneLoader {
+                source: "qrc:/models/test_scene.qgltf"
+            }
+        ]
+    }
 
-    components: [
-        Transform {
-            translation: root.position
-            rotation: fromEulerAngles(root.angleX, root.angleY, root.angleZ)
-            scale: root.scale
-        },
-        SceneLoader
-        {
-            source: "qrc:/models/wine.qgltf"
-        }
-    ]
+    Entity {
+        components: [
+            SceneLoader {
+                source: "qrc:/models/toyplane.qgltf"
+            }
+        ]
+    }
+
+    Entity {
+        components: [
+            Transform {
+                translation: Qt.vector3d(0, -20, 0)
+            },
+            SceneLoader {
+                source: "qrc:/models/trefoil.qgltf"
+            }
+        ]
+    }
 }
diff --git a/examples/qt3d/qgltf/main.qml b/examples/qt3d/qgltf/main.qml
index f1b9403c0..99e1bb930 100644
--- a/examples/qt3d/qgltf/main.qml
+++ b/examples/qt3d/qgltf/main.qml
@@ -58,23 +58,12 @@ Entity {
     }
 
     components: FrameGraph {
-        activeFrameGraph : Viewport {
-            CameraSelector {
-                camera: camera
-                ClearBuffer {
-                    buffers: ClearBuffer.ColorDepthBuffer
-                    SortMethod {
-                        criteria: [
-                            SortCriterion { sort: SortCriterion.BackToFront }
-                        ]
-                    }
-                }
-            }
+        activeFrameGraph: ForwardRenderer {
+            clearColor: Qt.rgba(0, 0.5, 1, 1)
+            camera: camera
         }
     }
 
-    Wine {
-        id: wineRack
-        position: Qt.vector3d(-60.0, 0.0, 0.0)
+    Scene {
     }
 }
diff --git a/examples/qt3d/qgltf/qgltf.pro b/examples/qt3d/qgltf/qgltf.pro
index 3ba543ec5..61361b0e6 100644
--- a/examples/qt3d/qgltf/qgltf.pro
+++ b/examples/qt3d/qgltf/qgltf.pro
@@ -11,10 +11,13 @@ SOURCES += \
 
 OTHER_FILES += \
     main.qml \
-    Wine.qml
+    Scene.qml
 
-QT3D_MODELS = ../exampleresources/assets/gltf/wine/wine.dae
-QGLTF_PARAMS = -g
+QT3D_MODELS = ../exampleresources/assets/test_scene.dae \
+              ../exampleresources/assets/obj/toyplane.obj \
+              ../exampleresources/assets/obj/trefoil.obj
+
+QGLTF_PARAMS = -b -S
 load(qgltf)
 
 RESOURCES += \
diff --git a/examples/qt3d/qgltf/qgltf_example.qrc b/examples/qt3d/qgltf/qgltf_example.qrc
index 0da7ea21f..72868031a 100644
--- a/examples/qt3d/qgltf/qgltf_example.qrc
+++ b/examples/qt3d/qgltf/qgltf_example.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
-        <file>Wine.qml</file>
+        <file>Scene.qml</file>
     </qresource>
 </RCC>