diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:02:03 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:02:04 +0200 |
commit | 3032eb9b92569f79d93842e757d325133a06de58 (patch) | |
tree | 0245395f0c7734c71ad5acbdb550a0e06198d4f9 /src/imports/qtcanvas3d/activeinfo3d.cpp | |
parent | c2f57acf4134e11d026e2b13b500329f1af750ef (diff) | |
parent | e07c2ea85f4681acec6fc07a04d2b08f1da0ced6 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ieaf95f81e3bf15161a1f0baea629d666742032c2
Diffstat (limited to 'src/imports/qtcanvas3d/activeinfo3d.cpp')
-rw-r--r-- | src/imports/qtcanvas3d/activeinfo3d.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/imports/qtcanvas3d/activeinfo3d.cpp b/src/imports/qtcanvas3d/activeinfo3d.cpp index 4967097..8c500b5 100644 --- a/src/imports/qtcanvas3d/activeinfo3d.cpp +++ b/src/imports/qtcanvas3d/activeinfo3d.cpp @@ -47,9 +47,11 @@ QT_CANVAS3D_BEGIN_NAMESPACE * \since QtCanvas3D 1.0 * \inqmlmodule QtCanvas3D * \brief Active attribute or uniform information. + * \deprecated * - * An uncreatable QML type that contains the information returned from the - * Context3D::getActiveAttrib() and Context3D::getActiveUniform() calls. + * \b{Deprecated in Qt 5.12.} An uncreatable QML type that contains the + * information returned from the Context3D::getActiveAttrib() and + * Context3D::getActiveUniform() calls. * * \sa Context3D, Canvas3D */ @@ -65,7 +67,7 @@ CanvasActiveInfo::CanvasActiveInfo(int size, CanvasContext::glEnums type, /*! * \qmlproperty string Canvas3DActiveInfo::name - * Name of the attribute or the uniform. + * \b{Deprecated in Qt 5.12.} Name of the attribute or the uniform. */ const QString CanvasActiveInfo::name() const { @@ -74,7 +76,8 @@ const QString CanvasActiveInfo::name() const /*! * \qmlproperty string Canvas3DActiveInfo::size - * Size of the attribute or the uniform, in units of its type. + * \b{Deprecated in Qt 5.12.} Size of the attribute or the uniform, in units of + * its type. * * \sa type */ @@ -85,7 +88,7 @@ int CanvasActiveInfo::size() const /*! * \qmlproperty string Canvas3DActiveInfo::type - * Type of the attribute or the uniform. + * \b{Deprecated in Qt 5.12.} Type of the attribute or the uniform. */ CanvasContext::glEnums CanvasActiveInfo::type() const { |