From 7b26f6a1746419161a8f875e341b3e31220f4141 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 29 Sep 2014 17:19:36 +0200 Subject: QNode refactoring Move almost everything to private classes. Assimp loading restored. All examples working. QNode hierachy is now handled through QObject::setParent, addChild, removeChild are part of the private api. Note: commented QChangeArbiter unit tests as they can no longer work with this patch and will restore them when QChangeArbiter will have been made private. Task-number: QTBUG-41470 Task-number: QTBUG-41523 Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9 Reviewed-by: Sean Harmer --- examples/playground-qml/main.qml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'examples/playground-qml/main.qml') diff --git a/examples/playground-qml/main.qml b/examples/playground-qml/main.qml index b2558ff2f..4074ba7c3 100644 --- a/examples/playground-qml/main.qml +++ b/examples/playground-qml/main.qml @@ -512,8 +512,11 @@ Entity { } } - SceneLoader - { + Entity { + + id : sceneEntity + + components : SceneLoader { id: scene source: ":/assets/test_scene.dae" objectName: "dae_scene" @@ -531,6 +534,8 @@ Entity { // components : [scaleSceneTransform] } + } + Layer { id: ballLayer; name : "balls" } Entity { -- cgit v1.2.3