aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-06-25 09:53:01 +0200
committerLiang Qi <liang.qi@qt.io>2018-06-25 12:15:55 +0200
commitfbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch)
tree18e22092c2764fea16442fd814f230d4fe095a49 /src/particles
parentc21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff)
parent9999591e69a0908cd3fbe14646fb98881e32061b (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp src/quick/handlers/qquickhandlerpoint.cpp src/quick/handlers/qquicksinglepointhandler.cpp tests/auto/qml/ecmascripttests/test262 Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/particles')
-rw-r--r--src/particles/qquickage.cpp2
-rw-r--r--src/particles/qquickangledirection.cpp2
-rw-r--r--src/particles/qquickcumulativedirection.cpp2
-rw-r--r--src/particles/qquickcustomparticle.cpp2
-rw-r--r--src/particles/qquickdirection.cpp2
-rw-r--r--src/particles/qquickellipseextruder.cpp2
-rw-r--r--src/particles/qquickfriction.cpp2
-rw-r--r--src/particles/qquickgravity.cpp2
-rw-r--r--src/particles/qquickgroupgoal.cpp2
-rw-r--r--src/particles/qquickimageparticle.cpp2
-rw-r--r--src/particles/qquickitemparticle.cpp2
-rw-r--r--src/particles/qquicklineextruder.cpp2
-rw-r--r--src/particles/qquickmaskextruder.cpp2
-rw-r--r--src/particles/qquickparticleaffector.cpp2
-rw-r--r--src/particles/qquickparticleemitter.cpp2
-rw-r--r--src/particles/qquickparticleextruder.cpp2
-rw-r--r--src/particles/qquickparticlegroup.cpp2
-rw-r--r--src/particles/qquickparticlepainter.cpp2
-rw-r--r--src/particles/qquickparticlesystem.cpp2
-rw-r--r--src/particles/qquickpointattractor.cpp2
-rw-r--r--src/particles/qquickpointdirection.cpp2
-rw-r--r--src/particles/qquickrectangleextruder.cpp2
-rw-r--r--src/particles/qquickspritegoal.cpp2
-rw-r--r--src/particles/qquicktargetdirection.cpp2
-rw-r--r--src/particles/qquicktrailemitter.cpp2
-rw-r--r--src/particles/qquickturbulence.cpp2
-rw-r--r--src/particles/qquickv4particledata.cpp2
-rw-r--r--src/particles/qquickwander.cpp2
28 files changed, 28 insertions, 28 deletions
diff --git a/src/particles/qquickage.cpp b/src/particles/qquickage.cpp
index bf3d042e32..e8f760b37c 100644
--- a/src/particles/qquickage.cpp
+++ b/src/particles/qquickage.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickAgeAffector
\inqmlmodule QtQuick.Particles
\inherits Affector
- \brief For altering particle ages
+ \brief For altering particle ages.
\ingroup qtquick-particles
The Age affector allows you to alter where the particle is in its lifecycle. Common uses
diff --git a/src/particles/qquickangledirection.cpp b/src/particles/qquickangledirection.cpp
index 34afd9ce84..bc84865804 100644
--- a/src/particles/qquickangledirection.cpp
+++ b/src/particles/qquickangledirection.cpp
@@ -49,7 +49,7 @@ const qreal CONV = 0.017453292519943295;
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Direction
- \brief For specifying a direction that varies in angle
+ \brief For specifying a direction that varies in angle.
The AngledDirection element allows both the specification of a direction by angle and magnitude,
as well as varying the parameters by angle or magnitude.
diff --git a/src/particles/qquickcumulativedirection.cpp b/src/particles/qquickcumulativedirection.cpp
index 447baf01d4..905d44cae9 100644
--- a/src/particles/qquickcumulativedirection.cpp
+++ b/src/particles/qquickcumulativedirection.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickCumulativeDirection
\inqmlmodule QtQuick.Particles
\inherits Direction
- \brief For specifying a direction made of other directions
+ \brief For specifying a direction made of other directions.
\ingroup qtquick-particles
The CumulativeDirection element will act as a direction that sums the directions within it.
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp
index 0e3c656762..8528a6f750 100644
--- a/src/particles/qquickcustomparticle.cpp
+++ b/src/particles/qquickcustomparticle.cpp
@@ -88,7 +88,7 @@ struct PlainVertices {
\instantiates QQuickCustomParticle
\inqmlmodule QtQuick.Particles
\inherits ParticlePainter
- \brief For specifying shaders to paint particles
+ \brief For specifying shaders to paint particles.
\ingroup qtquick-particles
\note The maximum number of custom particles is limited to 16383.
diff --git a/src/particles/qquickdirection.cpp b/src/particles/qquickdirection.cpp
index 5439930a0e..2688b560cb 100644
--- a/src/particles/qquickdirection.cpp
+++ b/src/particles/qquickdirection.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
\qmltype Direction
\instantiates QQuickDirection
\inqmlmodule QtQuick.Particles
- \brief For specifying a vector space
+ \brief For specifying a vector space.
\ingroup qtquick-particles
diff --git a/src/particles/qquickellipseextruder.cpp b/src/particles/qquickellipseextruder.cpp
index 52fccd6da9..c7aa138ff0 100644
--- a/src/particles/qquickellipseextruder.cpp
+++ b/src/particles/qquickellipseextruder.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Shape
- \brief Represents an ellipse to other particle system elements
+ \brief Represents an ellipse to other particle system elements.
This shape can be used by Emitter subclasses and Affector subclasses to have
them act upon an ellipse shaped area.
diff --git a/src/particles/qquickfriction.cpp b/src/particles/qquickfriction.cpp
index 718c1a0bf9..0b46b94d10 100644
--- a/src/particles/qquickfriction.cpp
+++ b/src/particles/qquickfriction.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Affector
- \brief For applying friction proportional to the particle's current velocity
+ \brief For applying friction proportional to the particle's current velocity.
*/
diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp
index 5ca126e64e..6def43896d 100644
--- a/src/particles/qquickgravity.cpp
+++ b/src/particles/qquickgravity.cpp
@@ -48,7 +48,7 @@ const qreal CONV = 0.017453292520444443;
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Affector
- \brief For applying acceleration in an angle
+ \brief For applying acceleration in an angle.
This element will accelerate all affected particles to a vector of
the specified magnitude in the specified angle. If the angle and acceleration do
diff --git a/src/particles/qquickgroupgoal.cpp b/src/particles/qquickgroupgoal.cpp
index 02cbe5a621..67356ba8f6 100644
--- a/src/particles/qquickgroupgoal.cpp
+++ b/src/particles/qquickgroupgoal.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Affector
- \brief For changing the state of a group of a particle
+ \brief For changing the state of a group of a particle.
*/
/*!
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index abd7793a74..0b1de08ea3 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -471,7 +471,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
\instantiates QQuickImageParticle
\inqmlmodule QtQuick.Particles
\inherits ParticlePainter
- \brief For visualizing logical particles using an image
+ \brief For visualizing logical particles using an image.
\ingroup qtquick-particles
This element renders a logical particle as an image. The image can be
diff --git a/src/particles/qquickitemparticle.cpp b/src/particles/qquickitemparticle.cpp
index 412390dffc..c5c18a201c 100644
--- a/src/particles/qquickitemparticle.cpp
+++ b/src/particles/qquickitemparticle.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickItemParticle
\inqmlmodule QtQuick.Particles
\inherits ParticlePainter
- \brief For specifying a delegate to paint particles
+ \brief For specifying a delegate to paint particles.
\ingroup qtquick-particles
*/
diff --git a/src/particles/qquicklineextruder.cpp b/src/particles/qquicklineextruder.cpp
index 670e656b8e..0fdba02734 100644
--- a/src/particles/qquicklineextruder.cpp
+++ b/src/particles/qquicklineextruder.cpp
@@ -45,7 +45,7 @@
\instantiates QQuickLineExtruder
\inqmlmodule QtQuick.Particles
\inherits Shape
- \brief Represents a line for affectors and emitters
+ \brief Represents a line for affectors and emitters.
\ingroup qtquick-particles
*/
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp
index 6ab6dcc6a4..4c5d9e9d88 100644
--- a/src/particles/qquickmaskextruder.cpp
+++ b/src/particles/qquickmaskextruder.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickMaskExtruder
\inqmlmodule QtQuick.Particles
\inherits Shape
- \brief For representing an image as a shape to affectors and emitters
+ \brief For representing an image as a shape to affectors and emitters.
\ingroup qtquick-particles
*/
diff --git a/src/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp
index 76089c1abd..3d6035c577 100644
--- a/src/particles/qquickparticleaffector.cpp
+++ b/src/particles/qquickparticleaffector.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickParticleAffector
\inqmlmodule QtQuick.Particles
\brief Applies alterations to the attributes of logical particles at any
- point in their lifetime
+ point in their lifetime.
\ingroup qtquick-particles
The base Affector does not alter any attributes, but can be used to emit a signal
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index 78409d3a44..cd4cdcf3ef 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
\qmltype Emitter
\instantiates QQuickParticleEmitter
\inqmlmodule QtQuick.Particles
- \brief Emits logical particles
+ \brief Emits logical particles.
\ingroup qtquick-particles
This element emits logical particles into the ParticleSystem, with the
diff --git a/src/particles/qquickparticleextruder.cpp b/src/particles/qquickparticleextruder.cpp
index 816ff34960..f56e288e09 100644
--- a/src/particles/qquickparticleextruder.cpp
+++ b/src/particles/qquickparticleextruder.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
\qmltype Shape
\instantiates QQuickParticleExtruder
\inqmlmodule QtQuick.Particles
- \brief For specifying an area for affectors and emitters
+ \brief For specifying an area for affectors and emitters.
\ingroup qtquick-particles
The base class is just a rectangle.
diff --git a/src/particles/qquickparticlegroup.cpp b/src/particles/qquickparticlegroup.cpp
index a42d2bcb13..052fda6eff 100644
--- a/src/particles/qquickparticlegroup.cpp
+++ b/src/particles/qquickparticlegroup.cpp
@@ -43,7 +43,7 @@
\qmltype ParticleGroup
\instantiates QQuickParticleGroup
\inqmlmodule QtQuick.Particles
- \brief For setting attributes on a logical particle group
+ \brief For setting attributes on a logical particle group.
\ingroup qtquick-particles
This element allows you to set timed transitions on particle groups.
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp
index 13591be97a..e762b3ae1d 100644
--- a/src/particles/qquickparticlepainter.cpp
+++ b/src/particles/qquickparticlepainter.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickParticlePainter
\inqmlmodule QtQuick.Particles
\inherits Item
- \brief For specifying how to paint particles
+ \brief For specifying how to paint particles.
\ingroup qtquick-particles
The default implementation paints nothing. See the subclasses if you want to
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 612675fec7..1499df0360 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -102,7 +102,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
\qmltype ParticleSystem
\instantiates QQuickParticleSystem
\inqmlmodule QtQuick.Particles
- \brief A system which includes particle painter, emitter, and affector types
+ \brief A system which includes particle painter, emitter, and affector types.
\ingroup qtquick-particles
*/
diff --git a/src/particles/qquickpointattractor.cpp b/src/particles/qquickpointattractor.cpp
index d7446842f2..cbc16f3a06 100644
--- a/src/particles/qquickpointattractor.cpp
+++ b/src/particles/qquickpointattractor.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Affector
- \brief For attracting particles towards a specific point
+ \brief For attracting particles towards a specific point.
Note that the size and position of this element affects which particles it affects.
The size of the point attracted to is always 0x0, and the location of that point
diff --git a/src/particles/qquickpointdirection.cpp b/src/particles/qquickpointdirection.cpp
index f22eea2a76..7b47fedf6b 100644
--- a/src/particles/qquickpointdirection.cpp
+++ b/src/particles/qquickpointdirection.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Direction
- \brief For specifying a direction that varies in x and y components
+ \brief For specifying a direction that varies in x and y components.
The PointDirection element allows both the specification of a direction by x and y components,
as well as varying the parameters by x or y component.
diff --git a/src/particles/qquickrectangleextruder.cpp b/src/particles/qquickrectangleextruder.cpp
index 36e4871d29..35207d34d2 100644
--- a/src/particles/qquickrectangleextruder.cpp
+++ b/src/particles/qquickrectangleextruder.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
\qmltype RectangleShape
\instantiates QQuickRectangleExtruder
\inqmlmodule QtQuick.Particles
- \brief For specifying an area for affectors and emitter
+ \brief For specifying an area for affectors and emitter.
\ingroup qtquick-particles
Just a rectangle.
diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp
index 75d6f8bdf6..d372fd961c 100644
--- a/src/particles/qquickspritegoal.cpp
+++ b/src/particles/qquickspritegoal.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-images-sprites
\inherits Affector
- \brief For changing the state of a sprite particle
+ \brief For changing the state of a sprite particle.
*/
/*!
diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp
index 5d84f9dc2b..0a0eeb4a24 100644
--- a/src/particles/qquicktargetdirection.cpp
+++ b/src/particles/qquicktargetdirection.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Direction
- \brief For specifying a direction towards the target point
+ \brief For specifying a direction towards the target point.
*/
/*!
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index fde5eab617..f0a0b297e2 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickTrailEmitter
\inqmlmodule QtQuick.Particles
\inherits QQuickParticleEmitter
- \brief Emits logical particles from other logical particles
+ \brief Emits logical particles from other logical particles.
\ingroup qtquick-particles
This element emits logical particles into the ParticleSystem, with the
diff --git a/src/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp
index dc72d884bc..dff266a6ea 100644
--- a/src/particles/qquickturbulence.cpp
+++ b/src/particles/qquickturbulence.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Affector
- \brief Provides fluid-like forces from a noise image
+ \brief Provides fluid-like forces from a noise image.
The Turbulence Element scales the noise source over the area it affects,
and uses the curl of that source to generate force vectors.
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp
index cf05245f5b..fe0c92bf06 100644
--- a/src/particles/qquickv4particledata.cpp
+++ b/src/particles/qquickv4particledata.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype Particle
\inqmlmodule QtQuick.Particles
- \brief Represents particles manipulated by emitters and affectors
+ \brief Represents particles manipulated by emitters and affectors.
\ingroup qtquick-particles
Particle elements are always managed internally by the ParticleSystem and cannot be created in QML.
diff --git a/src/particles/qquickwander.cpp b/src/particles/qquickwander.cpp
index a78482ec84..182bf4a099 100644
--- a/src/particles/qquickwander.cpp
+++ b/src/particles/qquickwander.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles
\ingroup qtquick-particles
\inherits Affector
- \brief For applying random particle trajectory
+ \brief For applying random particle trajectory.
*/
/*!