diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-12 14:10:32 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-12 14:10:32 +0000 |
| commit | d0da6c8b363da4715eb96fc0e24f802340234ac1 (patch) | |
| tree | 68b05c6eb8e72d77311c04cc809467777cc056dd /examples/qt3d | |
| parent | c706731aab9ab040cca016fbf7c4cf5bf7ec9aad (diff) | |
| parent | 6feaaef347d3c05963ee65707c4c2104109f387b (diff) | |
Merge branch '5.6' into dev
Change-Id: I6780d81672de7c81c9085bddbe481e689ca25132
Diffstat (limited to 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/qgltf/Wine.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/qt3d.pro | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/qt3d/qgltf/Wine.qml b/examples/qt3d/qgltf/Wine.qml index 4fab28479..b24e9de3f 100644 --- a/examples/qt3d/qgltf/Wine.qml +++ b/examples/qt3d/qgltf/Wine.qml @@ -54,7 +54,7 @@ Entity { }, SceneLoader { - source: "qrc:/models/wine.gltf" + source: "qrc:/models/wine.qgltf" } ] } diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index afa4cce79..829eb2789 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -44,9 +44,11 @@ SUBDIRS += \ instanced-arrays-qml \ picking-qml \ transforms-qml \ - qgltf \ lights +# qmake seems to break in some CI configurations, disable this for now +#SUBDIRS += qgltf + # TODO Port the old examples to new APIs #SUBDIRS += qt3d qtHaveModule(widgets): SUBDIRS += assimp-cpp \ |