diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:01:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:01:26 +0200 |
| commit | 7200f5d869be35cd7bc47b22487aca321335e31a (patch) | |
| tree | 8b4dbb7f31c10b1c3efe19b0e4d88005ae3c62a3 | |
| parent | f6816c121ab237c9956aeafd61d8d8a424edb07a (diff) | |
| parent | 5841fffd9bb4ef864d5856a6d6f9ccdc5e9df663 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
| -rw-r--r-- | src/doc/qt3d.qdocconf | 1 | ||||
| -rw-r--r-- | src/logic/qframeaction.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/doc/qt3d.qdocconf b/src/doc/qt3d.qdocconf index 25dafd2eb..ded8fea7a 100644 --- a/src/doc/qt3d.qdocconf +++ b/src/doc/qt3d.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qt3d.qdocconf) project = Qt3D description = Qt 3D Reference Documentation diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp index 77cdae943..a3ae748be 100644 --- a/src/logic/qframeaction.cpp +++ b/src/logic/qframeaction.cpp @@ -127,12 +127,12 @@ void QFrameAction::onTriggered(float dt) /*! \qmlsignal Qt3D.Logic::FrameAction::triggered(real dt) - This signal is emitted each frame. + This signal is emitted each frame with \a dt being the time (in seconds) since the last triggering. */ /*! \fn Qt3DLogic::QFrameAction::triggered(float dt) - This signal is emitted each frame with \a dt being the time since the last triggering. + This signal is emitted each frame with \a dt being the time (in seconds) since the last triggering. */ } // namespace Qt3DLogic |