diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /examples/qt3d/multiviewport/multiviewport.qrc | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'examples/qt3d/multiviewport/multiviewport.qrc')
-rw-r--r-- | examples/qt3d/multiviewport/multiviewport.qrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/qt3d/multiviewport/multiviewport.qrc b/examples/qt3d/multiviewport/multiviewport.qrc index bd06fb169..1a3f1977b 100644 --- a/examples/qt3d/multiviewport/multiviewport.qrc +++ b/examples/qt3d/multiviewport/multiviewport.qrc @@ -1,7 +1,8 @@ <RCC> <qresource prefix="/"> <file>main.qml</file> - <file>SimpleCamera.qml</file> <file>QuadViewportFrameGraph.qml</file> + <file>SimpleCamera.qml</file> + <file>Gear_scene.dae</file> </qresource> </RCC> |