summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@qt.io>2018-09-28 10:55:24 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2018-10-18 12:49:11 +0000
commit3d75a66c2908faa39d25b55f3d4b8ff3d0c5c4b7 (patch)
tree374e0a955427613c09be15b54bd0af9453d2e111
parent17c12d5b3939b5c67d4c5f68492d1d05792613f7 (diff)
Doc: fix broken links in qanimationcallback.cpp and qframegraphnode.cppv5.12.0-beta3
qframegraphnode.cpp:217: Cannot tie this documentation to anything qcallbackmapping.cpp:104: Can't link to 'QAnimationCallback::onValueChanged()' Change-Id: I20fb3a5688c16e86c2a62201991d30f735358d76 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--src/animation/frontend/qcallbackmapping.cpp2
-rw-r--r--src/render/framegraph/qframegraphnode.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp
index 3fcc7cf5e..c0163da80 100644
--- a/src/animation/frontend/qcallbackmapping.cpp
+++ b/src/animation/frontend/qcallbackmapping.cpp
@@ -107,7 +107,7 @@ void QCallbackMapping::setChannelName(const QString &channelName)
Such mappings do not have to have a target object and property name. When
the \a callback object is set, every change in the animated value will lead
to invoking the callback's
- \l{QAnimationCallback::onValueChanged()}{onValueChanged()} function either
+ \l {Qt3DAnimation::QAnimationCallback::valueChanged}{valueChanged} function either
on the gui/main thread, or directly on one of the thread pool's worker
thread. This is controlled by \a flags.
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index 3cf19d0d8..9acfd1209 100644
--- a/src/render/framegraph/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
@@ -215,6 +215,7 @@ QFrameGraphNode *QFrameGraphNode::parentFrameGraphNode() const
}
/*!
+ \internal
* Returns a list of the children that are frame graph nodes.
* If this function encounters a child node that is not a frame graph node,
* it will go through the children of the child node and look for frame graph nodes.