summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ogilvie <colin.ogilvie@kdab.com>2016-05-25 11:50:18 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-28 16:01:25 +0000
commit68ea7ea30a41ac6867550ad09a1d36f6b71e3aaf (patch)
tree8411c931b434398186648ccad2e5328aca5e82ee
parentb97129b6a893761e7dd636d7114befc40679b772 (diff)
Missing Signal Doc for QFrameAction
Task-number: QTBUG-46037 Change-Id: I4e99403ecd36619f92a2329d1db3e67bcd5ec057 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/logic/qframeaction.cpp11
-rw-r--r--src/logic/qlogicaspect.cpp2
2 files changed, 12 insertions, 1 deletions
diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp
index d99f2d33e..a7ca8d5d4 100644
--- a/src/logic/qframeaction.cpp
+++ b/src/logic/qframeaction.cpp
@@ -106,6 +106,17 @@ void QFrameAction::onTriggered(float dt)
emit triggered(dt);
}
+/*!
+ \qmlsignal Qt3D.Logic::FrameAction::triggered(float dt)
+ This signal is emitted each frame.
+
+ The corresponding handler is \c onTriggered
+*/
+
+/*!
+ \fn QFrameAction::triggered(float dt)
+ This signal is emitted each frame with \a dt being the time since the last triggering.
+*/
} // namespace Qt3DLogic
QT_END_NAMESPACE
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index 816cbf442..369410585 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -92,7 +92,7 @@ void QLogicAspectPrivate::registerBackendTypes()
}
/*!
- Constructs a new Qt3DLogic::QLogicAspect instance with /a parent.
+ Constructs a new Qt3DLogic::QLogicAspect instance with \a parent.
*/
QLogicAspect::QLogicAspect(QObject *parent)
: QLogicAspect(*new QLogicAspectPrivate(), parent) {}