Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/plugins/sceneparsers/gltf/gltfio.cpp
	src/render/io/objloader.cpp

Change-Id: I094c9310d56657ab19b4722b946c60d8cb490191

1 files changed, 6 insertions, 6 deletions

diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
index cadfa517e..d89b7f2fb 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
@@ -197,31 +197,31 @@ SceneModifier::~SceneModifier()
 //! [4]
 void SceneModifier::enableTorus(bool enabled)
 {
-    m_torusEntity->setParent(enabled ? m_rootEntity : nullptr);
+    m_torusEntity->setEnabled(enabled);
 }
 //! [4]
 
 void SceneModifier::enableCone(bool enabled)
 {
-    m_coneEntity->setParent(enabled ? m_rootEntity : nullptr);
+    m_coneEntity->setEnabled(enabled);
 }
 
 void SceneModifier::enableCylinder(bool enabled)
 {
-    m_cylinderEntity->setParent(enabled ? m_rootEntity : nullptr);
+    m_cylinderEntity->setEnabled(enabled);
 }
 
 void SceneModifier::enableCuboid(bool enabled)
 {
-    m_cuboidEntity->setParent(enabled ? m_rootEntity : nullptr);
+    m_cuboidEntity->setEnabled(enabled);
 }
 
 void SceneModifier::enablePlane(bool enabled)
 {
-    m_planeEntity->setParent(enabled ? m_rootEntity : nullptr);
+    m_planeEntity->setEnabled(enabled);
 }
 
 void SceneModifier::enableSphere(bool enabled)
 {
-    m_sphereEntity->setParent(enabled ? m_rootEntity : nullptr);
+    m_sphereEntity->setEnabled(enabled);
 }