summaryrefslogtreecommitdiffstats
path: root/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-15 03:02:03 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-15 03:02:04 +0200
commit3032eb9b92569f79d93842e757d325133a06de58 (patch)
tree0245395f0c7734c71ad5acbdb550a0e06198d4f9 /src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc
parentc2f57acf4134e11d026e2b13b500329f1af750ef (diff)
parente07c2ea85f4681acec6fc07a04d2b08f1da0ced6 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc')
-rw-r--r--src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc b/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc
index 66c3bfe..4014723 100644
--- a/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc
+++ b/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc
@@ -30,6 +30,11 @@
\page qtcanvas3d-index.html
\brief Provides functionality for 3D drawing inside Qt Quick 2.
+ \b{Canvas3D module was deprecated in Qt 5.12.} Depracated modules are no
+ longer maintained. They are provided to keep old source code working, but
+ they can be removed in a future release. We strongly advise against using
+ deprecated modules in new code or project.
+
Qt Canvas 3D module provides a way to make WebGL-like 3D drawing calls
from Qt Quick JavaScript.