summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2018-04-25 15:35:32 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2018-04-27 08:10:08 +0000
commit661f41e85c21b470a80c77aac3738a1ae24580a5 (patch)
treef07c51593e7fc0a4ce093858c3ba4464404797f8
parent196d037239a6499e8b21dbbf35ef3d65765bcd6a (diff)
Doc: Add note about projectionMatrix effect on projectionType in QML
Replicate information provided in the CPP class to expose the information for readers of QML documentation, as suggested by bug reporter. Task-number: QTBUG-64386 Change-Id: If448e0a54f9c238938a9d930a0a0edcf72efa2aa Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> (cherry picked from commit 2831c495233338403b31348393e785055700541b)
-rw-r--r--src/render/frontend/qcameralens.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/render/frontend/qcameralens.cpp b/src/render/frontend/qcameralens.cpp
index 3c6b8db68..a7172985d 100644
--- a/src/render/frontend/qcameralens.cpp
+++ b/src/render/frontend/qcameralens.cpp
@@ -132,6 +132,10 @@ namespace Qt3DRender {
/*!
* \qmlproperty matrix4x4 CameraLens::projectionMatrix
* Holds the current projection matrix of the camera lens.
+ *
+ * \note This will set the projection type to
+ * Qt3DRender::QCameraLens::CustomProjection and thus ignore all other camera
+ * parameters that might have been specified.
* \readonly
*/