diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-01-28 15:56:26 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-01-29 10:17:49 +0000 |
| commit | 8ef8c094dd55d198c5601689e0f1cc9fcc14274b (patch) | |
| tree | fbdd6c1e35a6f2606286752a98a9018213fdb789 /src/src.pro | |
| parent | 9c5bf588ab310e274fddffb252962e8abfa66bd2 (diff) | |
| parent | 2f3cfb7f19911f29e6ea7c0528b26f9263d38121 (diff) | |
Merge branch 'wip/qtquickintegration' into dev
Conflicts:
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
src/render/backend/triangleboundingvolume.cpp
src/render/backend/triangleboundingvolume_p.h
src/render/frontend/qrenderaspect.cpp
src/render/frontend/sphere.cpp
src/render/frontend/sphere_p.h
src/render/jobs/pickboundingvolumejob.cpp
src/render/jobs/pickboundingvolumejob_p.h
src/render/picking/objectpicker.cpp
src/render/raycasting/qcollisionqueryresult_p.h
src/render/render.pro
src/src.pro
tests/auto/render/objectpicker/tst_objectpicker.cpp
tests/auto/render/render.pro
Change-Id: I95717c7855887850d5c90e7ad8f19f1ffb37a545
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index afccd4ff7..0055274e0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -71,6 +71,11 @@ src_plugins_geometryloaders.file = $$PWD/plugins/geometryloaders/geometryloaders src_plugins_geometryloaders.target = sub-plugins-geometryloaders src_plugins_geometryloaders.depends = src_render src_extras +# Qt3D Render plugins +src_plugins_render.file = $$PWD/plugins/renderplugins/renderplugins.pro +src_plugins_render.target = sub-plugins-render +src_plugins_render.depends = src_render src_extras src_quick3d_render + SUBDIRS += \ src_core \ src_render \ @@ -89,6 +94,5 @@ SUBDIRS += \ src_quick3d_imports_extras \ src_plugins_sceneparsers \ src_plugins_geometryloaders \ + src_plugins_render \ doc - - |