diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-09-29 17:19:36 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-03 21:18:41 +0200 |
| commit | 7b26f6a1746419161a8f875e341b3e31220f4141 (patch) | |
| tree | f784e568015e1f7f199abb388b97fefdb158c84e /examples/playground-qml/main.qml | |
| parent | c16689bb1ccf31416df7b8c69fe032898cf87dec (diff) | |
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 <sean.harmer@kdab.com>
Diffstat (limited to 'examples/playground-qml/main.qml')
| -rw-r--r-- | examples/playground-qml/main.qml | 9 |
1 files changed, 7 insertions, 2 deletions
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 { |