diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
| commit | 9f8fc3717508a6b8045f65e6c820692fb67dc450 (patch) | |
| tree | ad426afcaa91f61ecd669fbc416838f108554771 /examples/qt3d/qt3d.pro | |
| parent | a830a9365832fd52c1849768543a64c55e4cee0a (diff) | |
| parent | cd9059a22604307f483764db134d51b15c540758 (diff) | |
Merge branch '5.9' into dev
Conflicts:
.qmake.conf
src/core/qscene.cpp
src/plugins/sceneparsers/gltf/gltfimporter.cpp
src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
src/render/texture/gltexture.cpp
Change-Id: I7bde0fc0177eae252fef01cc43725fcf69c13a80
Diffstat (limited to 'examples/qt3d/qt3d.pro')
| -rw-r--r-- | examples/qt3d/qt3d.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index dc5ba5a7e..7ac55bfd2 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -19,7 +19,8 @@ SUBDIRS += \ 3d-text \ qardboard \ advancedcustommaterial \ - simplecustommaterial + simplecustommaterial \ + scene2d qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml |