From b9930c53b256623fe8fa290f91138ac9b3c8b7c2 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 1 Jul 2019 16:02:11 +0200 Subject: Bump version Change-Id: I9e9da54e565ad7818e6ea8196a062af8b4931783 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2064bc2d3..dbe097680 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ QT3D_BUILD_ROOT = $$shadowed($$PWD) load(qt_build_config) -MODULE_VERSION = 5.12.4 +MODULE_VERSION = 5.12.5 -- cgit v1.2.3 From e8809595df21ec6c6631f2148e15605c004e1ca7 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 24 Jun 2019 10:42:13 -0500 Subject: Document unit for FrameAction::triggered Task-number: QTBUG-74165 Change-Id: I4d3de42cddd8f6e1e6729cc16a52e135ab7fa3b1 Reviewed-by: Paul Lemire --- src/logic/qframeaction.cpp | 4 ++-- 1 file 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 -- cgit v1.2.3