Doc: Fixed and updated Qt Quick's \qmlmodule page

-incremented version to Qt Quick 2.2 (in \qmlmodule page)
-import changed to QtQuick 2.2
-\inqmlmodule no longer needs the version. QDoc will ignore the version
but it is better to remove it now to avoid confusion

Task-number: QTBUG-32172
Change-Id: I40b52e59667014720be40a35b3a8fb9836825e31
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

15 files changed, 40 insertions, 40 deletions

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 904842b91e..60953528f6 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Animation
     \instantiates QQuickAbstractAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \brief Is the base of all QML animations
 
@@ -656,7 +656,7 @@ QQuickAbstractAnimation::ThreadingModel QQuickAbstractAnimation::threadingModel(
 /*!
     \qmltype PauseAnimation
     \instantiates QQuickPauseAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Provides a pause for an animation
@@ -727,7 +727,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
 /*!
     \qmltype ColorAnimation
     \instantiates QQuickColorAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in color values
@@ -872,7 +872,7 @@ void QActionAnimation::updateState(State newState, State oldState)
 /*!
     \qmltype ScriptAction
     \instantiates QQuickScriptAction
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Defines scripts to be run during an animation
@@ -999,7 +999,7 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action
 /*!
     \qmltype PropertyAction
     \instantiates QQuickPropertyAction
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Specifies immediate property changes during animation
@@ -1252,7 +1252,7 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti
 /*!
     \qmltype NumberAnimation
     \instantiates QQuickNumberAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in qreal-type values
@@ -1365,7 +1365,7 @@ void QQuickNumberAnimation::setTo(qreal t)
 /*!
     \qmltype Vector3dAnimation
     \instantiates QQuickVector3dAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in QVector3d values
@@ -1442,7 +1442,7 @@ void QQuickVector3dAnimation::setTo(QVector3D t)
 /*!
     \qmltype RotationAnimation
     \instantiates QQuickRotationAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in rotation values
@@ -1683,7 +1683,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
 /*!
     \qmltype SequentialAnimation
     \instantiates QQuickSequentialAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Allows animations to be run sequentially
@@ -1777,7 +1777,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
 /*!
     \qmltype ParallelAnimation
     \instantiates QQuickParallelAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Enables animations to be run in parallel
@@ -1926,7 +1926,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
 /*!
     \qmltype PropertyAnimation
     \instantiates QQuickPropertyAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits Animation
     \brief Animates changes in property values
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index caf1408bb3..ac2075df44 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -96,7 +96,7 @@ void QQuickAnimationControllerPrivate::animationCurrentTimeChanged(QAbstractAnim
 /*!
     \qmltype AnimationController
     \instantiates QQuickAnimationController
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-control
     \brief Enables manual control of animations
 
diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp
index de1cf2641b..59e2d8c39a 100644
--- a/src/quick/util/qquickanimator.cpp
+++ b/src/quick/util/qquickanimator.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Animator
     \instantiates QQuickAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief Is the base of all QML animators.
@@ -290,7 +290,7 @@ QAbstractAnimationJob *QQuickAnimator::transition(QQuickStateActions &actions,
 /*!
     \qmltype XAnimator
     \instantiates QQuickXAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The XAnimator type animates the x position of an Item.
@@ -322,7 +322,7 @@ QQuickAnimatorJob *QQuickXAnimator::createJob() const { return new QQuickXAnimat
 /*!
     \qmltype YAnimator
     \instantiates QQuickYAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The YAnimator type animates the y position of an Item.
@@ -354,7 +354,7 @@ QQuickAnimatorJob *QQuickYAnimator::createJob() const { return new QQuickYAnimat
 /*!
     \qmltype ScaleAnimator
     \instantiates QQuickScaleAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The ScaleAnimator type animates the scale factor of an Item.
@@ -386,7 +386,7 @@ QQuickAnimatorJob *QQuickScaleAnimator::createJob() const { return new QQuickSca
 /*!
     \qmltype OpacityAnimator
     \instantiates QQuickOpacityAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The OpacityAnimator type animates the opacity of an Item.
@@ -417,7 +417,7 @@ QQuickAnimatorJob *QQuickOpacityAnimator::createJob() const { return new QQuickO
 /*!
     \qmltype RotationAnimator
     \instantiates QQuickRotationAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The RotationAnimator type animates the rotation of an Item.
@@ -488,7 +488,7 @@ QQuickRotationAnimator::RotationDirection QQuickRotationAnimator::direction() co
 /*!
     \qmltype UniformAnimator
     \instantiates QQuickUniformAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The UniformAnimator type animates a uniform of a ShaderEffect.
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 855e99e5a9..41c7b63756 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -76,7 +76,7 @@ public:
 /*!
     \qmltype Behavior
     \instantiates QQuickBehavior
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \ingroup qtquick-interceptors
     \brief Defines a default animation for a property change
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index 841c7888ce..d53edb33f1 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -148,7 +148,7 @@ QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts;
 /*!
     \qmltype FontLoader
     \instantiates QQuickFontLoader
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-text-utility
     \brief Allows fonts to be loaded by name or URL
 
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 2278fd25ba..1c766b3286 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PathElement
     \instantiates QQuickPathElement
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief PathElement is the base path type
 
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Path
     \instantiates QQuickPath
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a path for use by \l PathView
 
@@ -888,7 +888,7 @@ bool QQuickCurve::hasRelativeY()
 /*!
     \qmltype PathAttribute
     \instantiates QQuickPathAttribute
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Specifies how to set an attribute at a given position in a Path
 
@@ -1005,7 +1005,7 @@ void QQuickPathAttribute::setValue(qreal value)
 /*!
     \qmltype PathLine
     \instantiates QQuickPathLine
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a straight line
 
@@ -1064,7 +1064,7 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathQuad
     \instantiates QQuickPathQuad
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a quadratic Bezier curve with a control point
 
@@ -1216,7 +1216,7 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathCubic
     \instantiates QQuickPathCubic
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a cubic Bezier curve with two control points
 
@@ -1440,7 +1440,7 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathCurve
     \instantiates QQuickPathCatmullRomCurve
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a point on a Catmull-Rom curve
 
@@ -1586,7 +1586,7 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa
 /*!
     \qmltype PathArc
     \instantiates QQuickPathArc
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines an arc with the given radius
 
@@ -1757,7 +1757,7 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathSvg
     \instantiates QQuickPathSvg
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a path using an SVG path data string
 
@@ -1810,7 +1810,7 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &)
 /*!
     \qmltype PathPercent
     \instantiates QQuickPathPercent
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Manipulates the way a path is interpreted
 
diff --git a/src/quick/util/qquickpathinterpolator.cpp b/src/quick/util/qquickpathinterpolator.cpp
index fad7ae9e7e..439e79c525 100644
--- a/src/quick/util/qquickpathinterpolator.cpp
+++ b/src/quick/util/qquickpathinterpolator.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PathInterpolator
     \instantiates QQuickPathInterpolator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-control
     \brief Specifies how to manually animate along a path
 
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index e6f89b9b89..635f6582aa 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PropertyChanges
     \instantiates QQuickPropertyChanges
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-states
     \brief Describes new property bindings or values for a state
 
diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 9dd9aa2e6d..fda0a90b20 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -309,7 +309,7 @@ void QSmoothedAnimation::init()
 /*!
     \qmltype SmoothedAnimation
     \instantiates QQuickSmoothedAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits NumberAnimation
     \brief Allows a property to smoothly track a value
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index 314d705f8b..b554d30be1 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -342,7 +342,7 @@ void QQuickSpringAnimationPrivate::updateMode()
 /*!
     \qmltype SpringAnimation
     \instantiates QQuickSpringAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits NumberAnimation
 
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index c89cea6767..57eaeade5f 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -122,7 +122,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
 /*!
     \qmltype State
     \instantiates QQuickState
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-states
     \brief Defines configurations of objects and properties
 
diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp
index 2ad42f68fb..70033a95a2 100644
--- a/src/quick/util/qquickstatechangescript.cpp
+++ b/src/quick/util/qquickstatechangescript.cpp
@@ -69,7 +69,7 @@ public:
 /*!
     \qmltype StateChangeScript
     \instantiates QQuickStateChangeScript
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-states
     \brief Specifies how to run a script in a state
 
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index a72a45e96b..86d0e1eea8 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -94,7 +94,7 @@ public:
 /*!
    \qmltype StateGroup
     \instantiates QQuickStateGroup
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
    \ingroup qtquick-states
    \brief Provides built-in state support for non-Item types
 
diff --git a/src/quick/util/qquicksystempalette.cpp b/src/quick/util/qquicksystempalette.cpp
index 4eb27e5024..8f17ae321d 100644
--- a/src/quick/util/qquicksystempalette.cpp
+++ b/src/quick/util/qquicksystempalette.cpp
@@ -59,7 +59,7 @@ public:
 /*!
     \qmltype SystemPalette
     \instantiates QQuickSystemPalette
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-utility
     \brief Provides access to the Qt palettes
 
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index 4db3fbbad7..423621f517 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Transition
     \instantiates QQuickTransition
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \brief Defines animated transitions that occur on state changes