diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:59 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:59 +0300 |
| commit | 1d1420cd7e49dd588b8986952c0bcd6b7e6b83cb (patch) | |
| tree | 01824a6aa66de0b045e96af73f29e03504a1b878 | |
| parent | 0132a99b2bee388b4d0c7365a380bca39e83af3b (diff) | |
| parent | 094774a9dda690d584a7bf07116962670a5be443 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Change-Id: I1cb7079469d6908f48338163f51ac8144b49654a
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/quick3d/qquick3dquaternionutils.cpp | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 53c1ac93..5aef1504 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.6 +MODULE_VERSION = 5.15.7 diff --git a/src/quick3d/qquick3dquaternionutils.cpp b/src/quick3d/qquick3dquaternionutils.cpp index 5c0e0f0f..e0b8e8d0 100644 --- a/src/quick3d/qquick3dquaternionutils.cpp +++ b/src/quick3d/qquick3dquaternionutils.cpp @@ -33,6 +33,24 @@ QT_BEGIN_NAMESPACE +/*! + \qmltype Quaternion + \inqmlmodule QtQuick3D + \since 5.15 + + \brief Provides utility functions for quaternion. + + The \c Quaternion is a global object with utility functions. + + It is not instantiable; to use it, call the members of the global \c Quaternion object + directly. For example: + + \qml + Node { + rotation: Quaternion.fromAxisAndAngle(Qt.vector3d(1, 0, 0), 45) + } + \endqml +*/ /*! \qmlmethod quaternion Quick3D::Quaternion::fromAxisAndAngle(vector3d axis, real angle) |