diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:09:02 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 09:26:34 +0000 |
| commit | 93ac7a64522cca2b8bff1dd572af754cc3608c4f (patch) | |
| tree | 41a7e8f4f0c767875556c8a2b7e4f0a8a59a970d | |
| parent | 06010d41368cd2f7e31fc13b98ac465886dc77a1 (diff) | |
| parent | e8809595df21ec6c6631f2148e15605c004e1ca7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Iabe445fa892f2022aa1e58d1783a2d588d6b6a87
| -rw-r--r-- | src/logic/qframeaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |