Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I0d32fc5b99f8c9e4acb922fffe4dd5f3c5be553c

4 files changed, 1 insertions, 7 deletions

diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp
index 5e2133dfaf..aa2617e64c 100644
--- a/src/particles/qquickcustomaffector.cpp
+++ b/src/particles/qquickcustomaffector.cpp
@@ -57,8 +57,6 @@ QT_BEGIN_NAMESPACE
 
     Note that JavaScript is slower to execute, so it is not recommended to use this in
     high-volume particle systems.
-
-    The corresponding handler is \c onAffectParticles.
 */
 
 /*!
diff --git a/src/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp
index ffbd5674f0..3e3346997e 100644
--- a/src/particles/qquickparticleaffector.cpp
+++ b/src/particles/qquickparticleaffector.cpp
@@ -126,8 +126,6 @@ QT_BEGIN_NAMESPACE
     signal with a high-volume particle system.
 
     (\a {x}, \a {y}) is the particle's current position.
-
-    The corresponding handler is \c onAffected.
 */
 QQuickParticleAffector::QQuickParticleAffector(QQuickItem *parent) :
     QQuickItem(parent), m_needsReset(false), m_ignoresTime(false), m_onceOff(false), m_enabled(true)
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index c0d9fa941d..3e9d7c02a9 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -196,8 +196,6 @@ QT_BEGIN_NAMESPACE
 
     \note JavaScript is slower to execute, so it is not recommended to use this in
     high-volume particle systems.
-
-    The corresponding handler is \c onEmitParticles.
 */
 
 /*! \qmlmethod QtQuick.Particles::Emitter::burst(int count)
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index 102dc7bd2e..5720460bae 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -123,7 +123,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
 
     This signal is emitted when particles are emitted from the \a followed particle. \a particles contains an array of particle objects which can be directly manipulated.
 
-    The corresponding handler is \c onEmitFollowParticles. If you use this signal handler, emitParticles will not be emitted.
+    If you use this signal handler, emitParticles will not be emitted.
 */
 
 bool QQuickTrailEmitter::isEmitFollowConnected()