Fix \inqmlmodule usage: only use one parameter

Since the command just links back to the corresponding module page, only the
first parameter is used, and the version causes more confusion.

Change-Id: I73ed289550c576747132f77b83c1257094059cd1
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

33 files changed, 36 insertions, 36 deletions

diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp
index 65f091a9e4..5fdf40f0fc 100644
--- a/src/imports/settings/qqmlsettings.cpp
+++ b/src/imports/settings/qqmlsettings.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Settings
     \instantiates QQmlSettings
-    \inqmlmodule Qt.labs.settings 1.0
+    \inqmlmodule Qt.labs.settings
     \ingroup settings
     \brief Provides persistent platform-independent application settings.
 
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index e3678ec75b..225eedb578 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -83,7 +83,7 @@ typedef QPair<int, int> QQuickXmlListRange;
 /*!
     \qmltype XmlRole
     \instantiates QQuickXmlListModelRole
-    \inqmlmodule QtQuick.XmlListModel 2
+    \inqmlmodule QtQuick.XmlListModel
     \brief For specifying a role to an XmlListModel
     \ingroup qtquick-models
 
@@ -612,7 +612,7 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo
 /*!
     \qmltype XmlListModel
     \instantiates QQuickXmlListModel
-    \inqmlmodule QtQuick.XmlListModel 2
+    \inqmlmodule QtQuick.XmlListModel
     \brief For specifying a read-only model using XPath expressions
     \ingroup qtquick-models
 
diff --git a/src/particles/qquickage.cpp b/src/particles/qquickage.cpp
index 14a591a39e..aa830784da 100644
--- a/src/particles/qquickage.cpp
+++ b/src/particles/qquickage.cpp
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Age
     \instantiates QQuickAgeAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits Affector
     \brief For altering particle ages
     \ingroup qtquick-particles
diff --git a/src/particles/qquickangledirection.cpp b/src/particles/qquickangledirection.cpp
index bf66059dd1..9fec60e386 100644
--- a/src/particles/qquickangledirection.cpp
+++ b/src/particles/qquickangledirection.cpp
@@ -42,7 +42,7 @@ const qreal CONV = 0.017453292519943295;
 /*!
     \qmltype AngleDirection
     \instantiates QQuickAngleDirection
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Direction
     \brief For specifying a direction that varies in angle
diff --git a/src/particles/qquickcumulativedirection.cpp b/src/particles/qquickcumulativedirection.cpp
index e9923d3a07..d791060a08 100644
--- a/src/particles/qquickcumulativedirection.cpp
+++ b/src/particles/qquickcumulativedirection.cpp
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype CumulativeDirection
     \instantiates QQuickCumulativeDirection
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits Direction
     \brief For specifying a direction made of other directions
     \ingroup qtquick-particles
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp
index 2ab24175a3..b656e7ec28 100644
--- a/src/particles/qquickcustomparticle.cpp
+++ b/src/particles/qquickcustomparticle.cpp
@@ -79,7 +79,7 @@ struct PlainVertices {
 /*!
     \qmltype CustomParticle
     \instantiates QQuickCustomParticle
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits ParticlePainter
     \brief For specifying shaders to paint particles
     \ingroup qtquick-particles
diff --git a/src/particles/qquickdirection.cpp b/src/particles/qquickdirection.cpp
index 86ed9b4bb3..1f1eb1a55e 100644
--- a/src/particles/qquickdirection.cpp
+++ b/src/particles/qquickdirection.cpp
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Direction
     \instantiates QQuickDirection
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \brief For specifying a vector space
     \ingroup qtquick-particles
 
diff --git a/src/particles/qquickellipseextruder.cpp b/src/particles/qquickellipseextruder.cpp
index 919647e2ad..da65f03c13 100644
--- a/src/particles/qquickellipseextruder.cpp
+++ b/src/particles/qquickellipseextruder.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype EllipseShape
     \instantiates QQuickEllipseExtruder
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Shape
     \brief Represents an ellipse to other particle system elements
diff --git a/src/particles/qquickfriction.cpp b/src/particles/qquickfriction.cpp
index 3b6bbf06b0..94e915fafc 100644
--- a/src/particles/qquickfriction.cpp
+++ b/src/particles/qquickfriction.cpp
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Friction
     \instantiates QQuickFrictionAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Affector
     \brief For applying friction proportional to the particle's current velocity
diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp
index 665805a013..0e96b83ecd 100644
--- a/src/particles/qquickgravity.cpp
+++ b/src/particles/qquickgravity.cpp
@@ -38,7 +38,7 @@ const qreal CONV = 0.017453292520444443;
 /*!
     \qmltype Gravity
     \instantiates QQuickGravityAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Affector
     \brief For applying acceleration in an angle
diff --git a/src/particles/qquickgroupgoal.cpp b/src/particles/qquickgroupgoal.cpp
index 54ea3cf619..0cd37f4472 100644
--- a/src/particles/qquickgroupgoal.cpp
+++ b/src/particles/qquickgroupgoal.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype GroupGoal
     \instantiates QQuickGroupGoalAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Affector
     \brief For changing the state of a group of a particle
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index 50fa9dbc64..3ba0e69039 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -477,7 +477,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
 /*!
     \qmltype ImageParticle
     \instantiates QQuickImageParticle
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits ParticlePainter
     \brief For visualizing logical particles using an image
     \ingroup qtquick-particles
diff --git a/src/particles/qquickitemparticle.cpp b/src/particles/qquickitemparticle.cpp
index 51038e350a..3c6e249a4a 100644
--- a/src/particles/qquickitemparticle.cpp
+++ b/src/particles/qquickitemparticle.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ItemParticle
     \instantiates QQuickItemParticle
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits ParticlePainter
     \brief For specifying a delegate to paint particles
     \ingroup qtquick-particles
diff --git a/src/particles/qquicklineextruder.cpp b/src/particles/qquicklineextruder.cpp
index fd2d5ae1bd..082a04cdb4 100644
--- a/src/particles/qquicklineextruder.cpp
+++ b/src/particles/qquicklineextruder.cpp
@@ -37,7 +37,7 @@
 /*!
     \qmltype LineShape
     \instantiates QQuickLineExtruder
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits Shape
     \brief Represents a line for affectors and emitters
     \ingroup qtquick-particles
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp
index dd06117f58..400343cf6d 100644
--- a/src/particles/qquickmaskextruder.cpp
+++ b/src/particles/qquickmaskextruder.cpp
@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype MaskShape
     \instantiates QQuickMaskExtruder
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits Shape
     \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 fcc1e6adb6..f81a4f5a53 100644
--- a/src/particles/qquickparticleaffector.cpp
+++ b/src/particles/qquickparticleaffector.cpp
@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Affector
     \instantiates QQuickParticleAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \brief Applies alterations to the attributes of logical particles at any
     point in their lifetime
     \ingroup qtquick-particles
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index 337057181c..9c7d9facf3 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Emitter
     \instantiates QQuickParticleEmitter
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \brief Emits logical particles
     \ingroup qtquick-particles
 
diff --git a/src/particles/qquickparticleextruder.cpp b/src/particles/qquickparticleextruder.cpp
index 31ff12ab0c..2ae2decbc8 100644
--- a/src/particles/qquickparticleextruder.cpp
+++ b/src/particles/qquickparticleextruder.cpp
@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Shape
     \instantiates QQuickParticleExtruder
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \brief For specifying an area for affectors and emitters
     \ingroup qtquick-particles
 
diff --git a/src/particles/qquickparticlegroup.cpp b/src/particles/qquickparticlegroup.cpp
index 5f55ffc7c4..2e70f9afdb 100644
--- a/src/particles/qquickparticlegroup.cpp
+++ b/src/particles/qquickparticlegroup.cpp
@@ -36,7 +36,7 @@
 /*!
     \qmltype ParticleGroup
     \instantiates QQuickParticleGroup
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \brief For setting attributes on a logical particle group
     \ingroup qtquick-particles
 
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp
index 4f8ad88ed1..f83e0cd278 100644
--- a/src/particles/qquickparticlepainter.cpp
+++ b/src/particles/qquickparticlepainter.cpp
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ParticlePainter
     \instantiates QQuickParticlePainter
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits Item
     \brief For specifying how to paint particles
     \ingroup qtquick-particles
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index db5d607922..51a92de00f 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -95,7 +95,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 /*!
     \qmltype ParticleSystem
     \instantiates QQuickParticleSystem
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \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 500669c1f0..caa544f2b6 100644
--- a/src/particles/qquickpointattractor.cpp
+++ b/src/particles/qquickpointattractor.cpp
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Attractor
     \instantiates QQuickAttractorAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Affector
     \brief For attracting particles towards a specific point
diff --git a/src/particles/qquickpointdirection.cpp b/src/particles/qquickpointdirection.cpp
index ff7e34831e..85d5eea6da 100644
--- a/src/particles/qquickpointdirection.cpp
+++ b/src/particles/qquickpointdirection.cpp
@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PointDirection
     \instantiates QQuickPointDirection
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Direction
     \brief For specifying a direction that varies in x and y components
diff --git a/src/particles/qquickrectangleextruder.cpp b/src/particles/qquickrectangleextruder.cpp
index 9bf41275cc..00c168e0e0 100644
--- a/src/particles/qquickrectangleextruder.cpp
+++ b/src/particles/qquickrectangleextruder.cpp
@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype RectangleShape
     \instantiates QQuickRectangleExtruder
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \brief For specifying an area for affectors and emitter
     \ingroup qtquick-particles
 
diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp
index a8c42de942..83470c3f16 100644
--- a/src/particles/qquickspritegoal.cpp
+++ b/src/particles/qquickspritegoal.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype SpriteGoal
     \instantiates QQuickSpriteGoalAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-images-sprites
     \inherits Affector
     \brief For changing the state of a sprite particle
diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp
index c997f26be1..98da6b1dda 100644
--- a/src/particles/qquicktargetdirection.cpp
+++ b/src/particles/qquicktargetdirection.cpp
@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype TargetDirection
     \instantiates QQuickTargetDirection
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Direction
     \brief For specifying a direction towards the target point
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index e07ad39590..d948f21820 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype TrailEmitter
     \instantiates QQuickTrailEmitter
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \inherits QQuickParticleEmitter
     \brief Emits logical particles from other logical particles
     \ingroup qtquick-particles
diff --git a/src/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp
index e9129ffd60..194df61eb8 100644
--- a/src/particles/qquickturbulence.cpp
+++ b/src/particles/qquickturbulence.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Turbulence
     \instantiates QQuickTurbulenceAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Affector
     \brief Provides fluid-like forces from a noise image
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp
index 586066ec24..4bac87eda4 100644
--- a/src/particles/qquickv4particledata.cpp
+++ b/src/particles/qquickv4particledata.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Particle
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \brief Represents particles manipulated by emitters and affectors
     \ingroup qtquick-particles
 
diff --git a/src/particles/qquickwander.cpp b/src/particles/qquickwander.cpp
index b6c70f6d30..1a14deda06 100644
--- a/src/particles/qquickwander.cpp
+++ b/src/particles/qquickwander.cpp
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Wander
     \instantiates QQuickWanderAffector
-    \inqmlmodule QtQuick.Particles 2
+    \inqmlmodule QtQuick.Particles
     \ingroup qtquick-particles
     \inherits Affector
     \brief For applying random particle trajectory
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 639df4f846..8b65373133 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -150,7 +150,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent)
 /*!
     \qmltype DelegateModel
     \instantiates QQmlDelegateModel
-    \inqmlmodule QtQml.Models 2
+    \inqmlmodule QtQml.Models
     \brief Encapsulates a model and delegate
 
     The DelegateModel type encapsulates a model and the delegate that will
@@ -2289,7 +2289,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package)
 /*!
     \qmltype DelegateModelGroup
     \instantiates QQmlDelegateModelGroup
-    \inqmlmodule QtQml.Models 2
+    \inqmlmodule QtQml.Models
     \ingroup qtquick-models
     \brief Encapsulates a filtered set of visual data items
 
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 142625d7ae..afd887ba53 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -1436,7 +1436,7 @@ void DynamicRoleModelNodeMetaObject::propertyWritten(int index)
 /*!
     \qmltype ListModel
     \instantiates QQmlListModel
-    \inqmlmodule QtQml.Models 2
+    \inqmlmodule QtQml.Models
     \ingroup qtquick-models
     \brief Defines a free-form list data source
 
@@ -2447,7 +2447,7 @@ bool QQmlListModelParser::definesEmptyList(const QString &s)
 /*!
     \qmltype ListElement
     \instantiates QQmlListElement
-    \inqmlmodule QtQml.Models 2
+    \inqmlmodule QtQml.Models
     \brief Defines a data item in a ListModel
     \ingroup qtquick-models
 
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index d2f47c41b2..7c1a951a2b 100644
--- a/src/qml/types/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
@@ -123,7 +123,7 @@ public:
 /*!
     \qmltype ObjectModel
     \instantiates QQmlObjectModel
-    \inqmlmodule QtQml.Models 2
+    \inqmlmodule QtQml.Models
     \ingroup qtquick-models
     \brief Defines a set of items to be used as a model