From b9930c53b256623fe8fa290f91138ac9b3c8b7c2 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
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 <mbrasser@ford.com>
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 <paul.lemire@kdab.com>
---
 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


From e919516c304f4d98fdc5311f4889c92852c718a3 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Wed, 3 Jul 2019 11:29:53 +0200
Subject: Doc: Replace example file lists with links to code.qt.io

Task-number: QTBUG-74391
Change-Id: Iec111e88d38fb9a143a60a647251601f331fc41e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 src/doc/qt3d.qdocconf | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.3