qdoc: no longer recognizes the version nr in QML refs

All QML references of the form
<QML-module-name><QML-module-version>::<QML-type>::<member-name> have
had the <QML-module-version> removed i.

Task-number: QTBUG-33776
Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

25 files changed, 157 insertions, 157 deletions

diff --git a/src/particles/qquickage.cpp b/src/particles/qquickage.cpp
index 1968e11f69..97e800e3cc 100644
--- a/src/particles/qquickage.cpp
+++ b/src/particles/qquickage.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     The Age affector only applies to particles which are still alive.
 */
 /*!
-    \qmlproperty int QtQuick.Particles2::Age::lifeLeft
+    \qmlproperty int QtQuick.Particles::Age::lifeLeft
 
     The amount of life to set the particle to have. Affected particles
     will advance to a point in their life where they will have this many
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::Age::advancePosition
+    \qmlproperty bool QtQuick.Particles::Age::advancePosition
 
     advancePosition determines whether position, veclocity and acceleration are included in
     the simulated aging done by the affector. If advancePosition is false,
diff --git a/src/particles/qquickangledirection.cpp b/src/particles/qquickangledirection.cpp
index b2ccd31eff..54f9093181 100644
--- a/src/particles/qquickangledirection.cpp
+++ b/src/particles/qquickangledirection.cpp
@@ -59,7 +59,7 @@ const qreal CONV = 0.017453292519943295;
     as well as varying the parameters by angle or magnitude.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::AngleDirection::angle
+    \qmlproperty real QtQuick.Particles::AngleDirection::angle
     This property specifies the base angle for the direction.
     The angle of this direction will vary by no more than angleVariation
     from this angle.
@@ -69,7 +69,7 @@ const qreal CONV = 0.017453292519943295;
     The default value is zero.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::AngleDirection::magnitude
+    \qmlproperty real QtQuick.Particles::AngleDirection::magnitude
     This property specifies the base magnitude for the direction.
     The magnitude of this direction will vary by no more than magnitudeVariation
     from this magnitude.
@@ -79,7 +79,7 @@ const qreal CONV = 0.017453292519943295;
     The default value is zero.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::AngleDirection::angleVariation
+    \qmlproperty real QtQuick.Particles::AngleDirection::angleVariation
     This property specifies the maximum angle variation for the direction.
     The angle of the direction will vary by up to angleVariation clockwise
     and anticlockwise from the value specified in angle.
@@ -89,7 +89,7 @@ const qreal CONV = 0.017453292519943295;
     The default value is zero.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::AngleDirection::magnitudeVariation
+    \qmlproperty real QtQuick.Particles::AngleDirection::magnitudeVariation
     This property specifies the base magnitude for the direction.
     The magnitude of this direction will vary by no more than magnitudeVariation
     from the base magnitude.
diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp
index 7c4d45d24e..890d415e3f 100644
--- a/src/particles/qquickcustomaffector.cpp
+++ b/src/particles/qquickcustomaffector.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 //TODO: Move docs (and inheritence) to real base when docs can propagate. Currently this pretends to be the base class!
 /*!
-    \qmlsignal QtQuick.Particles2::Affector::onAffectParticles(Array particles, real dt)
+    \qmlsignal QtQuick.Particles::Affector::onAffectParticles(Array particles, real dt)
 
     This handler is called when particles are selected to be affected. particles contains
     an array of particle objects which can be directly manipulated.
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty StochasticDirection QtQuick.Particles2::Affector::position
+    \qmlproperty StochasticDirection QtQuick.Particles::Affector::position
 
     Affected particles will have their position set to this direction,
     relative to the ParticleSystem. When interpreting directions as points,
@@ -71,21 +71,21 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty StochasticDirection QtQuick.Particles2::Affector::velocity
+    \qmlproperty StochasticDirection QtQuick.Particles::Affector::velocity
 
     Affected particles will have their velocity set to this direction.
 */
 
 
 /*!
-    \qmlproperty StochasticDirection QtQuick.Particles2::Affector::acceleration
+    \qmlproperty StochasticDirection QtQuick.Particles::Affector::acceleration
 
     Affected particles will have their acceleration set to this direction.
 */
 
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::Affector::relative
+    \qmlproperty bool QtQuick.Particles::Affector::relative
 
     Whether the affected particles have their existing position/velocity/acceleration added
     to the new one.
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp
index 4bcb86a51f..4ef35ffcfd 100644
--- a/src/particles/qquickcustomparticle.cpp
+++ b/src/particles/qquickcustomparticle.cpp
@@ -160,7 +160,7 @@ void QQuickCustomParticle::componentComplete()
 
 //Trying to keep the shader conventions the same as in qsgshadereffectitem
 /*!
-    \qmlproperty string QtQuick.Particles2::CustomParticle::fragmentShader
+    \qmlproperty string QtQuick.Particles::CustomParticle::fragmentShader
 
     This property holds the fragment shader's GLSL source code.
     The default shader expects the texture coordinate to be passed from the
@@ -182,7 +182,7 @@ void QQuickCustomParticle::setFragmentShader(const QByteArray &code)
 }
 
 /*!
-    \qmlproperty string QtQuick.Particles2::CustomParticle::vertexShader
+    \qmlproperty string QtQuick.Particles::CustomParticle::vertexShader
 
     This property holds the vertex shader's GLSL source code.
 
diff --git a/src/particles/qquickellipseextruder.cpp b/src/particles/qquickellipseextruder.cpp
index bce5a33294..f4374d8013 100644
--- a/src/particles/qquickellipseextruder.cpp
+++ b/src/particles/qquickellipseextruder.cpp
@@ -66,7 +66,7 @@ QQuickEllipseExtruder::QQuickEllipseExtruder(QObject *parent) :
 }
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::EllipseShape::fill
+    \qmlproperty bool QtQuick.Particles::EllipseShape::fill
     If fill is true the ellipse is filled; otherwise it is just a border.
 
     Default is true.
diff --git a/src/particles/qquickfriction.cpp b/src/particles/qquickfriction.cpp
index 4802077100..9b9b204b85 100644
--- a/src/particles/qquickfriction.cpp
+++ b/src/particles/qquickfriction.cpp
@@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Friction::factor
+    \qmlproperty real QtQuick.Particles::Friction::factor
 
     A drag will be applied to moving objects which is this factor of their current velocity.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Friction::threshold
+    \qmlproperty real QtQuick.Particles::Friction::threshold
 
     The drag will only be applied to objects with a velocity above the threshold velocity. The
     drag applied will bring objects down to the threshold velocity, but no further.
diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp
index c7856f30b9..d316422ca0 100644
--- a/src/particles/qquickgravity.cpp
+++ b/src/particles/qquickgravity.cpp
@@ -62,17 +62,17 @@ const qreal CONV = 0.017453292520444443;
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Gravity::magnitude
+    \qmlproperty real QtQuick.Particles::Gravity::magnitude
 
     Pixels per second that objects will be accelerated by.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Gravity::acceleration
+    \qmlproperty real QtQuick.Particles::Gravity::acceleration
 
     Name changed to magnitude, will be removed soon.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Gravity::angle
+    \qmlproperty real QtQuick.Particles::Gravity::angle
 
     Angle of acceleration.
 */
diff --git a/src/particles/qquickgroupgoal.cpp b/src/particles/qquickgroupgoal.cpp
index 949c39b335..5ef09c4185 100644
--- a/src/particles/qquickgroupgoal.cpp
+++ b/src/particles/qquickgroupgoal.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 */
 /*!
-    \qmlproperty string QtQuick.Particles2::GroupGoal::goalState
+    \qmlproperty string QtQuick.Particles::GroupGoal::goalState
 
     The name of the group which the affected particles should move to.
 
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
     on that path for their respective durations.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::GroupGoal::jump
+    \qmlproperty bool QtQuick.Particles::GroupGoal::jump
 
     If true, affected particles will jump directly to the target group instead of taking the
     the shortest valid path to get there. They will also not finish their current state,
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index 0902adaf5d..c550ef8f20 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -615,7 +615,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     other ImageParticles.
 */
 /*!
-    \qmlproperty url QtQuick.Particles2::ImageParticle::source
+    \qmlproperty url QtQuick.Particles::ImageParticle::source
 
     The source image to be used.
 
@@ -638,7 +638,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     and alpha levels to have maximum effect.
 */
 /*!
-    \qmlproperty list<Sprite> QtQuick.Particles2::ImageParticle::sprites
+    \qmlproperty list<Sprite> QtQuick.Particles::ImageParticle::sprites
 
     The sprite or sprites used to draw this particle.
 
@@ -648,7 +648,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     For full details, see the \l{Sprite Animation} overview.
 */
 /*!
-    \qmlproperty url QtQuick.Particles2::ImageParticle::colorTable
+    \qmlproperty url QtQuick.Particles::ImageParticle::colorTable
 
     An image whose color will be used as a 1D texture to determine color over life. E.g. when
     the particle is halfway through its lifetime, it will have the color specified halfway
@@ -657,28 +657,28 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     This color is blended with the color property and the color of the source image.
 */
 /*!
-    \qmlproperty url QtQuick.Particles2::ImageParticle::sizeTable
+    \qmlproperty url QtQuick.Particles::ImageParticle::sizeTable
 
     An image whose opacity will be used as a 1D texture to determine size over life.
 
     This property is expected to be removed shortly, in favor of custom easing curves to determine size over life.
 */
 /*!
-    \qmlproperty url QtQuick.Particles2::ImageParticle::opacityTable
+    \qmlproperty url QtQuick.Particles::ImageParticle::opacityTable
 
     An image whose opacity will be used as a 1D texture to determine size over life.
 
     This property is expected to be removed shortly, in favor of custom easing curves to determine opacity over life.
 */
 /*!
-    \qmlproperty color QtQuick.Particles2::ImageParticle::color
+    \qmlproperty color QtQuick.Particles::ImageParticle::color
 
     If a color is specified, the provided image will be colorized with it.
 
     Default is white (no change).
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::colorVariation
+    \qmlproperty real QtQuick.Particles::ImageParticle::colorVariation
 
     This number represents the color variation applied to individual particles.
     Setting colorVariation is the same as setting redVariation, greenVariation,
@@ -691,7 +691,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default is 0.0
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::redVariation
+    \qmlproperty real QtQuick.Particles::ImageParticle::redVariation
     The variation in the red color channel between particles.
 
     Color is measured, per channel, from 0.0 to 1.0.
@@ -699,7 +699,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default is 0.0
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::greenVariation
+    \qmlproperty real QtQuick.Particles::ImageParticle::greenVariation
     The variation in the green color channel between particles.
 
     Color is measured, per channel, from 0.0 to 1.0.
@@ -707,7 +707,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default is 0.0
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::blueVariation
+    \qmlproperty real QtQuick.Particles::ImageParticle::blueVariation
     The variation in the blue color channel between particles.
 
     Color is measured, per channel, from 0.0 to 1.0.
@@ -715,7 +715,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default is 0.0
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::alpha
+    \qmlproperty real QtQuick.Particles::ImageParticle::alpha
     An alpha to be applied to the image. This value is multiplied by the value in
     the image, and the value in the color property.
 
@@ -727,7 +727,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default is 1.0
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::alphaVariation
+    \qmlproperty real QtQuick.Particles::ImageParticle::alphaVariation
     The variation in the alpha channel between particles.
 
     Alpha is measured from 0.0 to 1.0.
@@ -735,33 +735,33 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default is 0.0
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::rotation
+    \qmlproperty real QtQuick.Particles::ImageParticle::rotation
 
     If set the image will be rotated by this many degrees before it is drawn.
 
     The particle coordinates are not transformed.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::rotationVariation
+    \qmlproperty real QtQuick.Particles::ImageParticle::rotationVariation
 
     If set the rotation of individual particles will vary by up to this much
     between particles.
 
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::rotationVelocity
+    \qmlproperty real QtQuick.Particles::ImageParticle::rotationVelocity
 
     If set particles will rotate at this velocity in degrees/second.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::ImageParticle::rotationVelocityVariation
+    \qmlproperty real QtQuick.Particles::ImageParticle::rotationVelocityVariation
 
     If set the rotationVelocity of individual particles will vary by up to this much
     between particles.
 
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::ImageParticle::autoRotation
+    \qmlproperty bool QtQuick.Particles::ImageParticle::autoRotation
 
     If set to true then a rotation will be applied on top of the particles rotation, so
     that it faces the direction of travel. So to face away from the direction of travel,
@@ -770,21 +770,21 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default is false
 */
 /*!
-    \qmlproperty StochasticDirection QtQuick.Particles2::ImageParticle::xVector
+    \qmlproperty StochasticDirection QtQuick.Particles::ImageParticle::xVector
 
     Allows you to deform the particle image when drawn. The rectangular image will
     be deformed so that the horizontal sides are in the shape of this vector instead
     of (1,0).
 */
 /*!
-    \qmlproperty StochasticDirection QtQuick.Particles2::ImageParticle::yVector
+    \qmlproperty StochasticDirection QtQuick.Particles::ImageParticle::yVector
 
     Allows you to deform the particle image when drawn. The rectangular image will
     be deformed so that the vertical sides are in the shape of this vector instead
     of (0,1).
 */
 /*!
-    \qmlproperty EntryEffect QtQuick.Particles2::ImageParticle::entryEffect
+    \qmlproperty EntryEffect QtQuick.Particles::ImageParticle::entryEffect
 
     This property provides basic and cheap entrance and exit effects for the particles.
     For fine-grained control, see sizeTable and opacityTable.
@@ -799,7 +799,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Default value is Fade.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::ImageParticle::spritesInterpolate
+    \qmlproperty bool QtQuick.Particles::ImageParticle::spritesInterpolate
 
     If set to true, sprite particles will interpolate between sprite frames each rendered frame, making
     the sprites look smoother.
@@ -808,7 +808,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
 */
 
 /*!
-    \qmlproperty Status QtQuick.Particles2::ImageParticle::status
+    \qmlproperty Status QtQuick.Particles::ImageParticle::status
 
     The status of loading the image.
 */
diff --git a/src/particles/qquickitemparticle.cpp b/src/particles/qquickitemparticle.cpp
index 7bc696e65f..728da57212 100644
--- a/src/particles/qquickitemparticle.cpp
+++ b/src/particles/qquickitemparticle.cpp
@@ -59,19 +59,19 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlmethod QtQuick.Particles2::ItemParticle::freeze(Item item)
+    \qmlmethod QtQuick.Particles::ItemParticle::freeze(Item item)
 
     Suspends the flow of time for the logical particle which item represents, allowing you to control its movement.
 */
 
 /*!
-    \qmlmethod QtQuick.Particles2::ItemParticle::unfreeze(Item item)
+    \qmlmethod QtQuick.Particles::ItemParticle::unfreeze(Item item)
 
     Restarts the flow of time for the logical particle which item represents, allowing it to be moved by the particle system again.
 */
 
 /*!
-    \qmlmethod QtQuick.Particles2::ItemParticle::take(Item item, bool prioritize)
+    \qmlmethod QtQuick.Particles::ItemParticle::take(Item item, bool prioritize)
 
     Asks the ItemParticle to take over control of item. It will be emitted when there is a logical particle available.
 
@@ -79,13 +79,13 @@ QT_BEGIN_NAMESPACE
     head of the queue.
 */
 /*!
-    \qmlmethod QtQuick.Particles2::ItemParticle::give(Item item)
+    \qmlmethod QtQuick.Particles::ItemParticle::give(Item item)
 
     Orders the ItemParticle to give you control of the item. It will cease controlling it and the item will lose its association to the logical particle.
 */
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::ItemParticle::fade
+    \qmlproperty bool QtQuick.Particles::ItemParticle::fade
 
     If true, the item will automatically be faded in and out
     at the ends of its lifetime. If false, you will have to
@@ -94,7 +94,7 @@ QT_BEGIN_NAMESPACE
     Default is true.
 */
 /*!
-    \qmlproperty Component QtQuick.Particles2::ItemParticle::delegate
+    \qmlproperty Component QtQuick.Particles::ItemParticle::delegate
 
     An instance of the delegate will be created for every logical
     particle, and moved along with it.
diff --git a/src/particles/qquicklineextruder.cpp b/src/particles/qquicklineextruder.cpp
index ade0573fc1..e00f5cb7d6 100644
--- a/src/particles/qquicklineextruder.cpp
+++ b/src/particles/qquicklineextruder.cpp
@@ -53,7 +53,7 @@
 */
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::LineShape::mirrored
+    \qmlproperty bool QtQuick.Particles::LineShape::mirrored
 
     By default, the line goes from (0,0) to (width, height) of the item that
     this shape is being applied to.
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp
index d59902bf3a..a680613ffb 100644
--- a/src/particles/qquickmaskextruder.cpp
+++ b/src/particles/qquickmaskextruder.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 */
 /*!
-    \qmlproperty url QtQuick.Particles2::MaskShape::source
+    \qmlproperty url QtQuick.Particles::MaskShape::source
 
     The image to use as the mask. Areas with non-zero opacity
     will be considered inside the shape.
diff --git a/src/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp
index f9885520c9..7c72c27b74 100644
--- a/src/particles/qquickparticleaffector.cpp
+++ b/src/particles/qquickparticleaffector.cpp
@@ -68,18 +68,18 @@ QT_BEGIN_NAMESPACE
     but on less capable hardware you should expect small irregularties in the simulation as simulates with worse granularity.
 */
 /*!
-    \qmlproperty ParticleSystem QtQuick.Particles2::Affector::system
+    \qmlproperty ParticleSystem QtQuick.Particles::Affector::system
     This is the system which will be affected by the element.
     If the Affector is a direct child of a ParticleSystem, it will automatically be associated with it.
 */
 /*!
-    \qmlproperty list<string> QtQuick.Particles2::Affector::groups
+    \qmlproperty list<string> QtQuick.Particles::Affector::groups
     Which logical particle groups will be affected.
 
     If empty, it will affect all particles.
 */
 /*!
-    \qmlproperty list<string> QtQuick.Particles2::Affector::whenCollidingWith
+    \qmlproperty list<string> QtQuick.Particles::Affector::whenCollidingWith
     If any logical particle groups are specified here, then the affector
     will only be triggered if the particle being examined intersects with
     a particle of one of these groups.
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
     By default, no groups are specified.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::Affector::enabled
+    \qmlproperty bool QtQuick.Particles::Affector::enabled
     If enabled is set to false, this affector will not affect any particles.
 
     Usually this is used to conditionally turn an affector on or off.
@@ -101,7 +101,7 @@ QT_BEGIN_NAMESPACE
     Default value is true.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::Affector::once
+    \qmlproperty bool QtQuick.Particles::Affector::once
     If once is set to true, this affector will only affect each particle
     once in their lifetimes. If the affector normally simulates a continuous
     effect over time, then it will simulate the effect of one second of time
@@ -110,12 +110,12 @@ QT_BEGIN_NAMESPACE
     Default value is false.
 */
 /*!
-    \qmlproperty Shape QtQuick.Particles2::Affector::shape
+    \qmlproperty Shape QtQuick.Particles::Affector::shape
     If a size has been defined, the shape property can be used to affect a
     non-rectangular area.
 */
 /*!
-    \qmlsignal QtQuick.Particles2::Affector::onAffected(real x, real y)
+    \qmlsignal QtQuick.Particles::Affector::onAffected(real x, real y)
 
     This handler is called when a particle is selected to be affected. It will not be called
     if a particle is considered by the Affector but not actually altered in any way.
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index 0f251ea751..41c64306a2 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -66,20 +66,20 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlproperty ParticleSystem QtQuick.Particles2::Emitter::system
+    \qmlproperty ParticleSystem QtQuick.Particles::Emitter::system
 
     This is the Particle system that the Emitter will emit into.
     This can be omitted if the Emitter is a direct child of the ParticleSystem
 */
 /*!
-    \qmlproperty string QtQuick.Particles2::Emitter::group
+    \qmlproperty string QtQuick.Particles::Emitter::group
 
     This is the logical particle group which it will emit into.
 
     Default value is "" (empty string).
 */
 /*!
-    \qmlproperty Shape QtQuick.Particles2::Emitter::shape
+    \qmlproperty Shape QtQuick.Particles::Emitter::shape
 
     This shape is applied with the size of the Emitter. Particles will be emitted
     randomly from any area covered by the shape.
@@ -88,21 +88,21 @@ QT_BEGIN_NAMESPACE
     box of the Emitter.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::Emitter::enabled
+    \qmlproperty bool QtQuick.Particles::Emitter::enabled
 
     If set to false, the emitter will cease emissions until it is set to true.
 
     Default value is true.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Emitter::emitRate
+    \qmlproperty real QtQuick.Particles::Emitter::emitRate
 
     Number of particles emitted per second.
 
     Default value is 10 particles per second.
 */
 /*!
-    \qmlproperty int QtQuick.Particles2::Emitter::lifeSpan
+    \qmlproperty int QtQuick.Particles::Emitter::lifeSpan
 
     The time in milliseconds each emitted particle should last for.
 
@@ -115,7 +115,7 @@ QT_BEGIN_NAMESPACE
     Default value is 1000 (one second).
 */
 /*!
-    \qmlproperty int QtQuick.Particles2::Emitter::lifeSpanVariation
+    \qmlproperty int QtQuick.Particles::Emitter::lifeSpanVariation
 
     Particle lifespans will vary by up to this much in either direction.
 
@@ -123,7 +123,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty int QtQuick.Particles2::Emitter::maximumEmitted
+    \qmlproperty int QtQuick.Particles::Emitter::maximumEmitted
 
     The maximum number of particles at a time that this emitter will have alive.
 
@@ -136,21 +136,21 @@ QT_BEGIN_NAMESPACE
     The default value is -1.
 */
 /*!
-    \qmlproperty int QtQuick.Particles2::Emitter::startTime
+    \qmlproperty int QtQuick.Particles::Emitter::startTime
 
     If this value is set when the emitter is loaded, then it will emit particles from the
     past, up to startTime milliseconds ago. These will simulate as if they were emitted then,
     but will not have any affectors applied to them. Affectors will take effect from the present time.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Emitter::size
+    \qmlproperty real QtQuick.Particles::Emitter::size
 
     The size in pixels of the particles at the start of their life.
 
     Default value is 16.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Emitter::endSize
+    \qmlproperty real QtQuick.Particles::Emitter::endSize
 
     The size in pixels of the particles at the end of their life. Size will
     be linearly interpolated during the life of the particle from this value and
@@ -160,7 +160,7 @@ QT_BEGIN_NAMESPACE
     Default value is -1.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Emitter::sizeVariation
+    \qmlproperty real QtQuick.Particles::Emitter::sizeVariation
 
     The size of a particle can vary by this much up or down from size/endSize. The same
     random addition is made to both size and endSize for a single particle.
@@ -168,17 +168,17 @@ QT_BEGIN_NAMESPACE
     Default value is 0.
 */
 /*!
-    \qmlproperty StochasticDirection QtQuick.Particles2::Emitter::velocity
+    \qmlproperty StochasticDirection QtQuick.Particles::Emitter::velocity
 
     The starting velocity of the particles emitted.
 */
 /*!
-    \qmlproperty StochasticDirection QtQuick.Particles2::Emitter::acceleration
+    \qmlproperty StochasticDirection QtQuick.Particles::Emitter::acceleration
 
     The starting acceleraton of the particles emitted.
 */
 /*!
-    \qmlproperty qreal QtQuick.Particles2::Emitter::velocityFromMovement
+    \qmlproperty qreal QtQuick.Particles::Emitter::velocityFromMovement
 
     If this value is non-zero, then any movement of the emitter will provide additional
     starting velocity to the particles based on the movement. The additional vector will be the
@@ -189,7 +189,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlsignal QtQuick.Particles2::Emitter::onEmitParticles(Array particles)
+    \qmlsignal QtQuick.Particles::Emitter::onEmitParticles(Array particles)
 
     This handler is called when particles are emitted. particles is a JavaScript
     array of Particle objects. You can modify particle attributes directly within the handler.
@@ -198,18 +198,18 @@ QT_BEGIN_NAMESPACE
     high-volume particle systems.
 */
 
-/*! \qmlmethod QtQuick.Particles2::Emitter::burst(int count)
+/*! \qmlmethod QtQuick.Particles::Emitter::burst(int count)
 
     Emits count particles from this emitter immediately.
 */
 
-/*! \qmlmethod QtQuick.Particles2::Emitter::burst(int count, int x, int y)
+/*! \qmlmethod QtQuick.Particles::Emitter::burst(int count, int x, int y)
 
     Emits count particles from this emitter immediately. The particles are emitted
     as if the Emitter was positioned at x,y but all other properties are the same.
 */
 
-/*! \qmlmethod QtQuick.Particles2::Emitter::pulse(int duration)
+/*! \qmlmethod QtQuick.Particles::Emitter::pulse(int duration)
 
     If the emitter is not enabled, enables it for duration milliseconds and then switches
     it back off.
diff --git a/src/particles/qquickparticlegroup.cpp b/src/particles/qquickparticlegroup.cpp
index b0b7865e46..2809e2176e 100644
--- a/src/particles/qquickparticlegroup.cpp
+++ b/src/particles/qquickparticlegroup.cpp
@@ -59,13 +59,13 @@
     none of the transition properties were set.
 */
 /*!
-    \qmlproperty ParticleSystem QtQuick.Particles2::ParticleGroup::system
+    \qmlproperty ParticleSystem QtQuick.Particles::ParticleGroup::system
     This is the system which will contain the group.
 
     If the ParticleGroup is a direct child of a ParticleSystem, it will automatically be associated with it.
 */
 /*!
-    \qmlproperty string QtQuick.Particles2::ParticleGroup::name
+    \qmlproperty string QtQuick.Particles::ParticleGroup::name
     This is the name of the particle group, and how it is generally referred to by other elements.
 
     If elements refer to a name which does not have an explicit ParticleGroup created, it will
@@ -73,18 +73,18 @@
     duration based transitions to a group, you do not need to create a ParticleGroup with that name (although you may).
 */
 /*!
-    \qmlproperty int QtQuick.Particles2::ParticleGroup::duration
+    \qmlproperty int QtQuick.Particles::ParticleGroup::duration
     The time in milliseconds before the group will attempt to transition.
 
 */
 /*!
-    \qmlproperty ParticleSystem QtQuick.Particles2::ParticleGroup::durationVariation
+    \qmlproperty ParticleSystem QtQuick.Particles::ParticleGroup::durationVariation
     The maximum number of milliseconds that the duration of the transition cycle varies per particle in the group.
 
     Default value is zero.
 */
 /*!
-    \qmlproperty ParticleSystem QtQuick.Particles2::ParticleGroup::to
+    \qmlproperty ParticleSystem QtQuick.Particles::ParticleGroup::to
     The weighted list of transitions valid for this group.
 
     If the chosen transition stays in this group, another duration (+/- up to durationVariation)
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp
index 694391a701..37f7e3b0ea 100644
--- a/src/particles/qquickparticlepainter.cpp
+++ b/src/particles/qquickparticlepainter.cpp
@@ -56,12 +56,12 @@ QT_BEGIN_NAMESPACE
 
 */
 /*!
-    \qmlproperty ParticleSystem QtQuick.Particles2::ParticlePainter::system
+    \qmlproperty ParticleSystem QtQuick.Particles::ParticlePainter::system
     This is the system whose particles can be painted by the element.
     If the ParticlePainter is a direct child of a ParticleSystem, it will automatically be associated with it.
 */
 /*!
-    \qmlproperty list<string> QtQuick.Particles2::ParticlePainter::groups
+    \qmlproperty list<string> QtQuick.Particles::ParticlePainter::groups
     Which logical particle groups will be painted.
 
     If empty, it will paint the default particle group ("").
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index b13020fc7d..b95b084756 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -110,7 +110,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::ParticleSystem::running
+    \qmlproperty bool QtQuick.Particles::ParticleSystem::running
 
     If running is set to false, the particle system will stop the simulation. All particles
     will be destroyed when the system is set to running again.
@@ -120,7 +120,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::ParticleSystem::paused
+    \qmlproperty bool QtQuick.Particles::ParticleSystem::paused
 
     If paused is set to true, the particle system will not advance the simulation. When
     paused is set to false again, the simulation will resume from the same point it was
@@ -133,7 +133,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::ParticleSystem::empty
+    \qmlproperty bool QtQuick.Particles::ParticleSystem::empty
 
     empty is set to true when there are no live particles left in the system.
 
@@ -145,19 +145,19 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlproperty list<Sprite> QtQuick.Particles2::ParticleSystem::particleStates
+    \qmlproperty list<Sprite> QtQuick.Particles::ParticleSystem::particleStates
 
     You can define a sub-set of particle groups in this property in order to provide them
     with stochastic state transitions.
 
-    Each QtQuick2::Sprite in this list is interpreted as corresponding to the particle group
+    Each QtQuick::Sprite in this list is interpreted as corresponding to the particle group
     with ths same name. Any transitions defined in these sprites will take effect on the particle
     groups as well. Additionally TrailEmitters, Affectors and ParticlePainters definined
     inside one of these sprites are automatically associated with the corresponding particle group.
 */
 
 /*!
-    \qmlmethod QtQuick.Particles2::ParticleSystem::pause()
+    \qmlmethod QtQuick.Particles::ParticleSystem::pause()
 
     Pauses the simulation if it is running.
 
@@ -165,7 +165,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlmethod QtQuick.Particles2::ParticleSystem::resume()
+    \qmlmethod QtQuick.Particles::ParticleSystem::resume()
 
     Resumes the simulation if it is paused.
 
@@ -173,7 +173,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlmethod QtQuick.Particles2::ParticleSystem::start()
+    \qmlmethod QtQuick.Particles::ParticleSystem::start()
 
     Starts the simulation if it has not already running.
 
@@ -181,7 +181,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlmethod QtQuick.Particles2::ParticleSystem::stop()
+    \qmlmethod QtQuick.Particles::ParticleSystem::stop()
 
     Stops the simulation if it is running.
 
@@ -189,14 +189,14 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlmethod QtQuick.Particles2::ParticleSystem::restart()
+    \qmlmethod QtQuick.Particles::ParticleSystem::restart()
 
     Stops the simulation if it is running, and then starts it.
 
     \sa stop, restart, running
 */
 /*!
-    \qmlmethod QtQuick.Particles2::ParticleSystem::reset()
+    \qmlmethod QtQuick.Particles::ParticleSystem::reset()
 
     Discards all currently existing particles.
 
diff --git a/src/particles/qquickpointattractor.cpp b/src/particles/qquickpointattractor.cpp
index 4d5d5c5247..5c1e4ef692 100644
--- a/src/particles/qquickpointattractor.cpp
+++ b/src/particles/qquickpointattractor.cpp
@@ -62,19 +62,19 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlproperty real QtQuick.Particles2::PointAttractor::pointX
+    \qmlproperty real QtQuick.Particles::PointAttractor::pointX
 
     The x coordinate of the attracting point. This is relative
     to the x coordinate of the Attractor.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::PointAttractor::pointY
+    \qmlproperty real QtQuick.Particles::PointAttractor::pointY
 
     The y coordinate of the attracting point. This is relative
     to the y coordinate of the Attractor.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::PointAttractor::strength
+    \qmlproperty real QtQuick.Particles::PointAttractor::strength
 
     The pull, in units per second, to be exerted on an item one pixel away.
 
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
     distance.
 */
 /*!
-    \qmlproperty AffectableParameter QtQuick.Particles2::Attractor::affectedParameter
+    \qmlproperty AffectableParameter QtQuick.Particles::Attractor::affectedParameter
 
     What attribute of particles is directly affected.
     \list
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
     \endlist
 */
 /*!
-    \qmlproperty Proportion QtQuick.Particles2::Attractor::proportionalToDistance
+    \qmlproperty Proportion QtQuick.Particles::Attractor::proportionalToDistance
 
     How the distance from the particle to the point affects the strength of the attraction.
 
diff --git a/src/particles/qquickpointdirection.cpp b/src/particles/qquickpointdirection.cpp
index d2dfd3b90d..07b266ee94 100644
--- a/src/particles/qquickpointdirection.cpp
+++ b/src/particles/qquickpointdirection.cpp
@@ -56,16 +56,16 @@ QT_BEGIN_NAMESPACE
     as well as varying the parameters by x or y component.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::PointDirection::x
+    \qmlproperty real QtQuick.Particles::PointDirection::x
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::PointDirection::y
+    \qmlproperty real QtQuick.Particles::PointDirection::y
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::PointDirection::xVariation
+    \qmlproperty real QtQuick.Particles::PointDirection::xVariation
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::PointDirection::yVariation
+    \qmlproperty real QtQuick.Particles::PointDirection::yVariation
 */
 
 QQuickPointDirection::QQuickPointDirection(QObject *parent) :
diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp
index 4e62de55be..c31ef46326 100644
--- a/src/particles/qquickspritegoal.cpp
+++ b/src/particles/qquickspritegoal.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 */
 /*!
-    \qmlproperty string QtQuick.Particles2::SpriteGoal::goalState
+    \qmlproperty string QtQuick.Particles::SpriteGoal::goalState
 
     The name of the Sprite which the affected particles should move to.
 
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
     on that path.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::SpriteGoal::jump
+    \qmlproperty bool QtQuick.Particles::SpriteGoal::jump
 
     If true, affected sprites will jump directly to the goal state instead of taking the
     the shortest valid path to get there. They will also not finish their current state,
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
     Default is false.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::SpriteGoal::systemStates
+    \qmlproperty bool QtQuick.Particles::SpriteGoal::systemStates
 
     deprecated, use GroupGoal instead
 */
diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp
index 6c44ecccab..47fca58f2d 100644
--- a/src/particles/qquicktargetdirection.cpp
+++ b/src/particles/qquicktargetdirection.cpp
@@ -55,27 +55,27 @@ QT_BEGIN_NAMESPACE
 
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TargetDirection::targetX
+    \qmlproperty real QtQuick.Particles::TargetDirection::targetX
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TargetDirection::targetY
+    \qmlproperty real QtQuick.Particles::TargetDirection::targetY
 */
 /*!
-    \qmlproperty Item QtQuick.Particles2::TargetDirection::targetItem
+    \qmlproperty Item QtQuick.Particles::TargetDirection::targetItem
     If specified, this will take precedence over targetX and targetY.
     The targeted point will be the center of the specified Item
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TargetDirection::targetVariation
+    \qmlproperty real QtQuick.Particles::TargetDirection::targetVariation
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TargetDirection::magnitude
+    \qmlproperty real QtQuick.Particles::TargetDirection::magnitude
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TargetDirection::magnitudeVariation
+    \qmlproperty real QtQuick.Particles::TargetDirection::magnitudeVariation
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::TargetDirection::proportionalMagnitude
+    \qmlproperty bool QtQuick.Particles::TargetDirection::proportionalMagnitude
 
     If true, then the value of magnitude and magnitudeVariation shall be interpreted as multiples
     of the distance between the source point and the target point, per second.
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index 7b5788f467..cbc738fba5 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -76,12 +76,12 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty string QtQuick.Particles2::TrailEmitter::follow
+    \qmlproperty string QtQuick.Particles::TrailEmitter::follow
 
     The type of logical particle which this is emitting from.
 */
 /*!
-    \qmlproperty qreal QtQuick.Particles2::TrailEmitter::velocityFromMovement
+    \qmlproperty qreal QtQuick.Particles::TrailEmitter::velocityFromMovement
 
     If this value is non-zero, then any movement of the emitter will provide additional
     starting velocity to the particles based on the movement. The additional vector will be the
@@ -91,7 +91,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
     Default value is 0.
 */
 /*!
-    \qmlproperty Shape QtQuick.Particles2::TrailEmitter::emitShape
+    \qmlproperty Shape QtQuick.Particles::TrailEmitter::emitShape
 
     As the area of a TrailEmitter is the area it follows, a separate shape can be provided
     to be the shape it emits out of. This shape has width and height specified by emitWidth
@@ -100,7 +100,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
     The default shape is a filled Rectangle.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TrailEmitter::emitWidth
+    \qmlproperty real QtQuick.Particles::TrailEmitter::emitWidth
 
     The width in pixels the emitShape is scaled to. If set to TrailEmitter.ParticleSize,
     the width will be the current size of the particle being followed.
@@ -108,7 +108,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
     Default is 0.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TrailEmitter::emitHeight
+    \qmlproperty real QtQuick.Particles::TrailEmitter::emitHeight
 
     The height in pixels the emitShape is scaled to. If set to TrailEmitter.ParticleSize,
     the height will be the current size of the particle being followed.
@@ -116,10 +116,10 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
     Default is 0.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::TrailEmitter::emitRatePerParticle
+    \qmlproperty real QtQuick.Particles::TrailEmitter::emitRatePerParticle
 */
 /*!
-    \qmlsignal QtQuick.Particles2::TrailEmitter::onEmitFollowParticles(Array particles, Particle followed)
+    \qmlsignal QtQuick.Particles::TrailEmitter::onEmitFollowParticles(Array particles, Particle followed)
 
     This handler is called when particles are emitted from the \a followed particle. \a particles contains an array of particle objects which can be directly manipulated.
 
diff --git a/src/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp
index 38e82f5dea..19cac7b730 100644
--- a/src/particles/qquickturbulence.cpp
+++ b/src/particles/qquickturbulence.cpp
@@ -63,14 +63,14 @@ QT_BEGIN_NAMESPACE
     The source should be relatively smooth black and white noise, such as perlin noise.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Turbulence::strength
+    \qmlproperty real QtQuick.Particles::Turbulence::strength
 
     The magnitude of the velocity vector at any point varies between zero and
     the square root of two. It will then be multiplied by strength to get the
     velocity per second for the particles affected by the turbulence.
 */
 /*!
-    \qmlproperty url QtQuick.Particles2::Turbulence::noiseSource
+    \qmlproperty url QtQuick.Particles::Turbulence::noiseSource
 
     The source image to generate the turbulence from. It will be scaled to the size of the element,
     so equal or larger sizes will give better results. Tweaking this image is the only way to tweak
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp
index ac19e025f6..3cfce0ae90 100644
--- a/src/particles/qquickv4particledata.cpp
+++ b/src/particles/qquickv4particledata.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::initialX
+    \qmlproperty real QtQuick.Particles::Particle::initialX
     The x coordinate of the particle at the beginning of its lifetime.
 
     The method of simulation prefers to have the initial values changed, rather
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::initialVX
+    \qmlproperty real QtQuick.Particles::Particle::initialVX
     The x velocity of the particle at the beginning of its lifetime.
 
     The method of simulation prefers to have the initial values changed, rather
@@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::initialAX
+    \qmlproperty real QtQuick.Particles::Particle::initialAX
     The x acceleration of the particle at the beginning of its lifetime.
 
     The method of simulation prefers to have the initial values changed, rather
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::initialY
+    \qmlproperty real QtQuick.Particles::Particle::initialY
     The y coordinate of the particle at the beginning of its lifetime.
 
     The method of simulation prefers to have the initial values changed, rather
@@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::initialVY
+    \qmlproperty real QtQuick.Particles::Particle::initialVY
     The y velocity of the particle at the beginning of its lifetime.
 
     The method of simulation prefers to have the initial values changed, rather
@@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::initialAY
+    \qmlproperty real QtQuick.Particles::Particle::initialAY
     The y acceleration of the particle at the beginning of its lifetime.
 
     The method of simulation prefers to have the initial values changed, rather
@@ -113,50 +113,50 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::x
+    \qmlproperty real QtQuick.Particles::Particle::x
     The current x coordinate of the particle.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::vx
+    \qmlproperty real QtQuick.Particles::Particle::vx
     The current x velocity of the particle.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::ax
+    \qmlproperty real QtQuick.Particles::Particle::ax
     The current x acceleration of the particle.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::y
+    \qmlproperty real QtQuick.Particles::Particle::y
     The current y coordinate of the particle.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::vy
+    \qmlproperty real QtQuick.Particles::Particle::vy
     The current y velocity of the particle.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::ay
+    \qmlproperty real QtQuick.Particles::Particle::ay
     The current y acceleration of the particle.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::t
+    \qmlproperty real QtQuick.Particles::Particle::t
     The time, in seconds since the beginning of the simulation, that the particle was born.
 */
 
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::startSize
+    \qmlproperty real QtQuick.Particles::Particle::startSize
     The size in pixels that the particle image is at the start
     of its life.
 */
 
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::endSize
+    \qmlproperty real QtQuick.Particles::Particle::endSize
     The size in pixels that the particle image is at the end
     of its life. If this value is less than 0, then it is
     disregarded and the particle will have its startSize for the
@@ -164,35 +164,35 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::lifeSpan
+    \qmlproperty real QtQuick.Particles::Particle::lifeSpan
     The time in seconds that the particle will live for.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::rotation
+    \qmlproperty real QtQuick.Particles::Particle::rotation
     Degrees clockwise that the particle image is rotated at
     the beginning of its life.
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::rotationVelocity
+    \qmlproperty real QtQuick.Particles::Particle::rotationVelocity
     Degrees clockwise per second that the particle image is rotated at while alive.
 */
 /*!
-    \qmlproperty bool QtQuick.Particles2::Particle::autoRotate
+    \qmlproperty bool QtQuick.Particles::Particle::autoRotate
     If autoRotate is true, then the particle's rotation will be
     set so that it faces the direction of travel, plus any
     rotation from the rotation or rotationVelocity properties.
 */
 
 /*!
-    \qmlproperty bool QtQuick.Particles2::Particle::update
+    \qmlproperty bool QtQuick.Particles::Particle::update
 
     Inside an Affector, the changes made to the particle will only be
     applied if update is set to true.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::xDeformationVectorX
+    \qmlproperty real QtQuick.Particles::Particle::xDeformationVectorX
 
     The x component of the deformation vector along the X axis. ImageParticle
     can draw particles across non-square shapes. It will draw the texture rectangle
@@ -200,7 +200,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::yDeformationVectorX
+    \qmlproperty real QtQuick.Particles::Particle::yDeformationVectorX
 
     The y component of the deformation vector along the X axis. ImageParticle
     can draw particles across non-square shapes. It will draw the texture rectangle
@@ -208,7 +208,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::xDeformationVectorY
+    \qmlproperty real QtQuick.Particles::Particle::xDeformationVectorY
 
     The x component of the deformation vector along the X axis. ImageParticle
     can draw particles across non-square shapes. It will draw the texture rectangle
@@ -216,7 +216,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::yDeformationVectorY
+    \qmlproperty real QtQuick.Particles::Particle::yDeformationVectorY
 
     The y component of the deformation vector along the Y axis. ImageParticle
     can draw particles across non-square shapes. It will draw the texture rectangle
@@ -224,7 +224,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::red
+    \qmlproperty real QtQuick.Particles::Particle::red
 
     ImageParticle can draw colorized particles. When it does so, red is used
     as the red channel of the color applied to the source image.
@@ -233,7 +233,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::green
+    \qmlproperty real QtQuick.Particles::Particle::green
 
     ImageParticle can draw colorized particles. When it does so, green is used
     as the green channel of the color applied to the source image.
@@ -242,7 +242,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::blue
+    \qmlproperty real QtQuick.Particles::Particle::blue
 
     ImageParticle can draw colorized particles. When it does so, blue is used
     as the blue channel of the color applied to the source image.
@@ -251,7 +251,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::alpha
+    \qmlproperty real QtQuick.Particles::Particle::alpha
 
     ImageParticle can draw colorized particles. When it does so, alpha is used
     as the alpha channel of the color applied to the source image.
@@ -259,12 +259,12 @@ QT_BEGIN_NAMESPACE
     Values are from 0.0 to 1.0.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::lifeLeft
+    \qmlproperty real QtQuick.Particles::Particle::lifeLeft
     The time in seconds that the particle has left to live at
     the current point in time.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Particle::currentSize
+    \qmlproperty real QtQuick.Particles::Particle::currentSize
     The currentSize of the particle, interpolating between startSize and endSize based on the currentTime.
 */
 
diff --git a/src/particles/qquickwander.cpp b/src/particles/qquickwander.cpp
index 64e3b6d838..f1b238af6e 100644
--- a/src/particles/qquickwander.cpp
+++ b/src/particles/qquickwander.cpp
@@ -52,26 +52,26 @@ QT_BEGIN_NAMESPACE
 
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Wander::pace
+    \qmlproperty real QtQuick.Particles::Wander::pace
 
     Maximum attribute change per second.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Wander::xVariance
+    \qmlproperty real QtQuick.Particles::Wander::xVariance
 
     Maximum attribute x value (as a result of Wander).
 
     If unset, Wander will not affect x values.
 */
 /*!
-    \qmlproperty real QtQuick.Particles2::Wander::yVariance
+    \qmlproperty real QtQuick.Particles::Wander::yVariance
 
     Maximum attribute y value (as a result of Wander).
 
     If unset, Wander will not affect y values.
 */
 /*!
-    \qmlproperty AffectableParameter QtQuick.Particles2::Wander::affectedParameter
+    \qmlproperty AffectableParameter QtQuick.Particles::Wander::affectedParameter
 
     What attribute of particles is directly affected.
     \list