diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2018-02-15 12:44:27 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2018-02-15 20:59:03 +0000 |
commit | 6e82860f19bb28744c0d7f6ccc88ca89b187e3ce (patch) | |
tree | 1c8682d5bf06a0a03cefc3da5e3918056de78a04 /src/extras | |
parent | 0bbccd492532786adc6816b992b85b4fdf162842 (diff) | |
parent | e1d1a59eb04f8b17582571275073a6cfa10e9e32 (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/animation/doc/src/qt3danimation-module.qdoc
src/render/backend/abstractrenderer_p.h
src/render/backend/buffervisitor_p.h
src/render/backend/renderer.cpp
src/render/backend/renderer_p.h
src/render/backend/triangleboundingvolume_p.h
src/render/backend/trianglesextractor_p.h
src/render/frontend/sphere_p.h
src/render/jobs/calcboundingvolumejob.cpp
src/render/jobs/job_common_p.h
src/render/jobs/pickboundingvolumejob.cpp
src/render/jobs/pickboundingvolumejob_p.h
src/render/jobs/pickboundingvolumeutils.cpp
src/render/jobs/renderviewjobutils_p.h
tests/auto/render/boundingsphere/tst_boundingsphere.cpp
tests/auto/render/commons/testrenderer.h
tests/auto/render/raycasting/tst_raycasting.cpp
tests/auto/render/render.pro
tests/auto/render/renderer/tst_renderer.cpp
Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3
Diffstat (limited to 'src/extras')
-rw-r--r-- | src/extras/defaults/qabstractcameracontroller.h | 1 | ||||
-rw-r--r-- | src/extras/doc/src/qt3dextras-module.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/extras/defaults/qabstractcameracontroller.h b/src/extras/defaults/qabstractcameracontroller.h index f13079f5f..e5d14745a 100644 --- a/src/extras/defaults/qabstractcameracontroller.h +++ b/src/extras/defaults/qabstractcameracontroller.h @@ -96,6 +96,7 @@ protected: Qt3DInput::QKeyboardDevice *keyboardDevice() const; Qt3DInput::QMouseDevice *mouseDevice() const; +public: struct InputState { float rxAxisValue; diff --git a/src/extras/doc/src/qt3dextras-module.qdoc b/src/extras/doc/src/qt3dextras-module.qdoc index 5461a5b09..a90d29a51 100644 --- a/src/extras/doc/src/qt3dextras-module.qdoc +++ b/src/extras/doc/src/qt3dextras-module.qdoc @@ -42,7 +42,7 @@ \title Qt 3D Extras C++ Classes \keyword Qt 3D Extras - \brief The Qt 3D Extras modules provides a set of prebuilt elements to help + \brief The Qt 3D Extras module provides a set of prebuilt elements to help you get started with Qt 3D. This module is still in tech preview. This means it is unstable, likely to |