summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-04-19 15:15:44 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-04-20 09:35:56 +0000
commitbc99b1f658184cfa25f5a725b3703e38c1d98fad (patch)
tree9f62f761742ec9662b79eb62e26ebcb529a31e02 /src
parente1b1373c91d92a93107e1c28085be592a062afd5 (diff)
QFrameAction: remove virtual on onTriggered
People can connect to the signal if they need a custom behavior. Task-number: QTBUG-51461 Change-Id: I515dba51626f64914f9c7df0dffad6fe7b0c9ab8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/logic/qframeaction.cpp3
-rw-r--r--src/logic/qframeaction.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp
index 27d969235..bc7094205 100644
--- a/src/logic/qframeaction.cpp
+++ b/src/logic/qframeaction.cpp
@@ -95,7 +95,8 @@ QFrameAction::~QFrameAction()
}
/*!
- This virtual function will be called in a synchronous manner once each frame by
+ \internal
+ This function will be called in a synchronous manner once each frame by
the Logic aspect.
*/
void QFrameAction::onTriggered(float dt)
diff --git a/src/logic/qframeaction.h b/src/logic/qframeaction.h
index a9aae346d..7a869a5f6 100644
--- a/src/logic/qframeaction.h
+++ b/src/logic/qframeaction.h
@@ -72,7 +72,7 @@ private:
Q_DECLARE_PRIVATE(QFrameAction)
QT3D_CLONEABLE(QFrameAction)
- virtual void onTriggered(float dt);
+ void onTriggered(float dt);
friend class Logic::Executor;
};