Bulk update of QtQuick 1 docs to \qmlmodule syntax

Change-Id: I7ed2b54ef5a706dcaf7e19d221a6dda7b2620e8c
Reviewed-on: http://codereview.qt.nokia.com/1681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

18 files changed, 212 insertions, 179 deletions

diff --git a/src/qtquick1/util/qdeclarativeanimation.cpp b/src/qtquick1/util/qdeclarativeanimation.cpp
index 3b05429c84..46c3f15a29 100644
--- a/src/qtquick1/util/qdeclarativeanimation.cpp
+++ b/src/qtquick1/util/qdeclarativeanimation.cpp
@@ -76,8 +76,9 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Animation QDeclarative1AbstractAnimation
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \brief The Animation element is the base of all QML animations.
 
     The Animation element cannot be used directly in a QML file.  It exists
@@ -101,7 +102,7 @@ QDeclarative1AbstractAnimation::QDeclarative1AbstractAnimation(QDeclarative1Abst
 }
 
 /*!
-    \qmlproperty bool Animation::running
+    \qmlproperty bool QtQuick1::Animation::running
     This property holds whether the animation is currently running.
 
     The \c running property can be set to declaratively control whether or not
@@ -238,7 +239,7 @@ void QDeclarative1AbstractAnimation::setRunning(bool r)
 }
 
 /*!
-    \qmlproperty bool Animation::paused
+    \qmlproperty bool QtQuick1::Animation::paused
     This property holds whether the animation is currently paused.
 
     The \c paused property can be set to declaratively control whether or not
@@ -297,7 +298,7 @@ void QDeclarative1AbstractAnimation::componentFinalized()
 }
 
 /*!
-    \qmlproperty bool Animation::alwaysRunToEnd
+    \qmlproperty bool QtQuick1::Animation::alwaysRunToEnd
     This property holds whether the animation should run to completion when it is stopped.
 
     If this true the animation will complete its current iteration when it
@@ -329,7 +330,7 @@ void QDeclarative1AbstractAnimation::setAlwaysRunToEnd(bool f)
 }
 
 /*!
-    \qmlproperty int Animation::loops
+    \qmlproperty int QtQuick1::Animation::loops
     This property holds the number of times the animation should play.
 
     By default, \c loops is 1: the animation will play through once and then stop.
@@ -406,7 +407,7 @@ void QDeclarative1AbstractAnimation::setGroup(QDeclarative1AnimationGroup *g)
 }
 
 /*!
-    \qmlmethod Animation::start()
+    \qmlmethod QtQuick1::Animation::start()
     \brief Starts the animation.
 
     If the animation is already running, calling this method has no effect.  The
@@ -418,7 +419,7 @@ void QDeclarative1AbstractAnimation::start()
 }
 
 /*!
-    \qmlmethod Animation::pause()
+    \qmlmethod QtQuick1::Animation::pause()
     \brief Pauses the animation.
 
     If the animation is already paused, calling this method has no effect.  The
@@ -430,7 +431,7 @@ void QDeclarative1AbstractAnimation::pause()
 }
 
 /*!
-    \qmlmethod Animation::resume()
+    \qmlmethod QtQuick1::Animation::resume()
     \brief Resumes a paused animation.
 
     If the animation is not paused, calling this method has no effect.  The
@@ -442,7 +443,7 @@ void QDeclarative1AbstractAnimation::resume()
 }
 
 /*!
-    \qmlmethod Animation::stop()
+    \qmlmethod QtQuick1::Animation::stop()
     \brief Stops the animation.
 
     If the animation is not running, calling this method has no effect.  The
@@ -467,7 +468,7 @@ void QDeclarative1AbstractAnimation::stop()
 }
 
 /*!
-    \qmlmethod Animation::restart()
+    \qmlmethod QtQuick1::Animation::restart()
     \brief Restarts the animation.
 
     This is a convenience method, and is equivalent to calling \c stop() and
@@ -480,7 +481,7 @@ void QDeclarative1AbstractAnimation::restart()
 }
 
 /*!
-    \qmlmethod Animation::complete()
+    \qmlmethod QtQuick1::Animation::complete()
     \brief Stops the animation, jumping to the final property values.
 
     If the animation is not running, calling this method has no effect.  The
@@ -556,8 +557,9 @@ void QDeclarative1AbstractAnimation::timelineComplete()
 
 /*!
     \qmlclass PauseAnimation QDeclarative1PauseAnimation
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The PauseAnimation element provides a pause for an animation.
 
@@ -594,7 +596,7 @@ void QDeclarative1PauseAnimationPrivate::init()
 }
 
 /*!
-    \qmlproperty int PauseAnimation::duration
+    \qmlproperty int QtQuick1::PauseAnimation::duration
     This property holds the duration of the pause in milliseconds
 
     The default value is 250.
@@ -627,8 +629,9 @@ QAbstractAnimation *QDeclarative1PauseAnimation::qtAnimation()
 
 /*!
     \qmlclass ColorAnimation QDeclarative1ColorAnimation
+    \inqmlmodule QtQuick 1
   \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits PropertyAnimation
     \brief The ColorAnimation element animates changes in color values.
 
@@ -668,7 +671,7 @@ QDeclarative1ColorAnimation::~QDeclarative1ColorAnimation()
 }
 
 /*!
-    \qmlproperty color ColorAnimation::from
+    \qmlproperty color QtQuick1::ColorAnimation::from
     This property holds the color value at which the animation should begin.
 
     For example, the following animation is not applied until a color value
@@ -705,7 +708,7 @@ void QDeclarative1ColorAnimation::setFrom(const QColor &f)
 }
 
 /*!
-    \qmlproperty color ColorAnimation::to
+    \qmlproperty color QtQuick1::ColorAnimation::to
 
     This property holds the color value at which the animation should end.
 
@@ -731,8 +734,9 @@ void QDeclarative1ColorAnimation::setTo(const QColor &t)
 
 /*!
     \qmlclass ScriptAction QDeclarative1ScriptAction
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The ScriptAction element allows scripts to be run during an animation.
 
@@ -776,7 +780,7 @@ void QDeclarative1ScriptActionPrivate::init()
 }
 
 /*!
-    \qmlproperty script ScriptAction::script
+    \qmlproperty script QtQuick1::ScriptAction::script
     This property holds the script to run.
 */
 QDeclarativeScriptString QDeclarative1ScriptAction::script() const
@@ -792,7 +796,7 @@ void QDeclarative1ScriptAction::setScript(const QDeclarativeScriptString &script
 }
 
 /*!
-    \qmlproperty string ScriptAction::scriptName
+    \qmlproperty string QtQuick1::ScriptAction::scriptName
     This property holds the the name of the StateChangeScript to run.
 
     This property is only valid when ScriptAction is used as part of a transition.
@@ -865,8 +869,9 @@ QAbstractAnimation *QDeclarative1ScriptAction::qtAnimation()
 
 /*!
     \qmlclass PropertyAction QDeclarative1PropertyAction
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The PropertyAction element allows immediate property changes during animation.
 
@@ -952,10 +957,10 @@ void QDeclarative1PropertyAction::setProperty(const QString &n)
 }
 
 /*!
-    \qmlproperty Object PropertyAction::target
-    \qmlproperty list<Object> PropertyAction::targets
-    \qmlproperty string PropertyAction::property
-    \qmlproperty string PropertyAction::properties
+    \qmlproperty Object QtQuick1::PropertyAction::target
+    \qmlproperty list<Object> QtQuick1::PropertyAction::targets
+    \qmlproperty string QtQuick1::PropertyAction::property
+    \qmlproperty string QtQuick1::PropertyAction::properties
 
     These properties determine the items and their properties that are
     affected by this action.
@@ -988,7 +993,7 @@ QDeclarativeListProperty<QObject> QDeclarative1PropertyAction::targets()
 }
 
 /*!
-    \qmlproperty list<Object> PropertyAction::exclude
+    \qmlproperty list<Object> QtQuick1::PropertyAction::exclude
     This property holds the objects that should not be affected by this action.
 
     \sa targets
@@ -1000,7 +1005,7 @@ QDeclarativeListProperty<QObject> QDeclarative1PropertyAction::exclude()
 }
 
 /*!
-    \qmlproperty any PropertyAction::value
+    \qmlproperty any QtQuick1::PropertyAction::value
     This property holds the value to be set on the property.
 
     If the PropertyAction is defined within a \l Transition or \l Behavior,
@@ -1126,8 +1131,9 @@ void QDeclarative1PropertyAction::transition(QDeclarative1StateActions &actions,
 
 /*!
     \qmlclass NumberAnimation QDeclarative1NumberAnimation
+    \inqmlmodule QtQuick 1
   \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits PropertyAnimation
     \brief The NumberAnimation element animates changes in qreal-type values.
 
@@ -1175,7 +1181,7 @@ void QDeclarative1NumberAnimation::init()
 }
 
 /*!
-    \qmlproperty real NumberAnimation::from
+    \qmlproperty real QtQuick1::NumberAnimation::from
     This property holds the starting value for the animation.
 
     For example, the following animation is not applied until the \c x value
@@ -1213,7 +1219,7 @@ void QDeclarative1NumberAnimation::setFrom(qreal f)
 }
 
 /*!
-    \qmlproperty real NumberAnimation::to
+    \qmlproperty real QtQuick1::NumberAnimation::to
     This property holds the end value for the animation.
 
     If the NumberAnimation is defined within a \l Transition or \l Behavior,
@@ -1238,8 +1244,9 @@ void QDeclarative1NumberAnimation::setTo(qreal t)
 
 /*!
     \qmlclass Vector3dAnimation QDeclarative1Vector3dAnimation
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits PropertyAnimation
     \brief The Vector3dAnimation element animates changes in QVector3d values.
 
@@ -1267,7 +1274,7 @@ QDeclarative1Vector3dAnimation::~QDeclarative1Vector3dAnimation()
 }
 
 /*!
-    \qmlproperty real Vector3dAnimation::from
+    \qmlproperty real QtQuick1::Vector3dAnimation::from
     This property holds the starting value for the animation.
 
     If the Vector3dAnimation is defined within a \l Transition or \l Behavior,
@@ -1289,7 +1296,7 @@ void QDeclarative1Vector3dAnimation::setFrom(QVector3D f)
 }
 
 /*!
-    \qmlproperty real Vector3dAnimation::to
+    \qmlproperty real QtQuick1::Vector3dAnimation::to
     This property holds the end value for the animation.
 
     If the Vector3dAnimation is defined within a \l Transition or \l Behavior,
@@ -1314,8 +1321,9 @@ void QDeclarative1Vector3dAnimation::setTo(QVector3D t)
 
 /*!
     \qmlclass RotationAnimation QDeclarative1RotationAnimation
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits PropertyAnimation
     \brief The RotationAnimation element animates changes in rotation values.
 
@@ -1403,7 +1411,7 @@ QDeclarative1RotationAnimation::~QDeclarative1RotationAnimation()
 }
 
 /*!
-    \qmlproperty real RotationAnimation::from
+    \qmlproperty real QtQuick1::RotationAnimation::from
     This property holds the starting value for the animation.
 
     For example, the following animation is not applied until the \c angle value
@@ -1440,7 +1448,7 @@ void QDeclarative1RotationAnimation::setFrom(qreal f)
 }
 
 /*!
-    \qmlproperty real RotationAnimation::to
+    \qmlproperty real QtQuick1::RotationAnimation::to
     This property holds the end value for the animation..
 
     If the RotationAnimation is defined within a \l Transition or \l Behavior,
@@ -1462,7 +1470,7 @@ void QDeclarative1RotationAnimation::setTo(qreal t)
 }
 
 /*!
-    \qmlproperty enumeration RotationAnimation::direction
+    \qmlproperty enumeration QtQuick1::RotationAnimation::direction
     This property holds the direction of the rotation.
 
     Possible values are:
@@ -1558,8 +1566,9 @@ QDeclarativeListProperty<QDeclarative1AbstractAnimation> QDeclarative1AnimationG
 
 /*!
     \qmlclass SequentialAnimation QDeclarative1SequentialAnimation
+    \inqmlmodule QtQuick 1
   \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The SequentialAnimation element allows animations to be run sequentially.
 
@@ -1632,8 +1641,9 @@ void QDeclarative1SequentialAnimation::transition(QDeclarative1StateActions &act
 
 /*!
     \qmlclass ParallelAnimation QDeclarative1ParallelAnimation
+    \inqmlmodule QtQuick 1
   \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The ParallelAnimation element allows animations to be run in parallel.
 
@@ -1746,8 +1756,9 @@ void QDeclarative1PropertyAnimationPrivate::convertVariant(QVariant &variant, in
 
 /*!
     \qmlclass PropertyAnimation QDeclarative1PropertyAnimation
+    \inqmlmodule QtQuick 1
   \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The PropertyAnimation element animates changes in property values.
 
@@ -1832,7 +1843,7 @@ void QDeclarative1PropertyAnimationPrivate::init()
 }
 
 /*!
-    \qmlproperty int PropertyAnimation::duration
+    \qmlproperty int QtQuick1::PropertyAnimation::duration
     This property holds the duration of the animation, in milliseconds.
 
     The default value is 250.
@@ -1858,7 +1869,7 @@ void QDeclarative1PropertyAnimation::setDuration(int duration)
 }
 
 /*!
-    \qmlproperty real PropertyAnimation::from
+    \qmlproperty real QtQuick1::PropertyAnimation::from
     This property holds the starting value for the animation.
 
     If the PropertyAnimation is defined within a \l Transition or \l Behavior,
@@ -1885,7 +1896,7 @@ void QDeclarative1PropertyAnimation::setFrom(const QVariant &f)
 }
 
 /*!
-    \qmlproperty real PropertyAnimation::to
+    \qmlproperty real QtQuick1::PropertyAnimation::to
     This property holds the end value for the animation.
 
     If the PropertyAnimation is defined within a \l Transition or \l Behavior,
@@ -1912,10 +1923,10 @@ void QDeclarative1PropertyAnimation::setTo(const QVariant &t)
 }
 
 /*!
-    \qmlproperty enumeration PropertyAnimation::easing.type
-    \qmlproperty real PropertyAnimation::easing.amplitude
-    \qmlproperty real PropertyAnimation::easing.overshoot
-    \qmlproperty real PropertyAnimation::easing.period
+    \qmlproperty enumeration QtQuick1::PropertyAnimation::easing.type
+    \qmlproperty real QtQuick1::PropertyAnimation::easing.amplitude
+    \qmlproperty real QtQuick1::PropertyAnimation::easing.overshoot
+    \qmlproperty real QtQuick1::PropertyAnimation::easing.period
     \brief the easing curve used for the animation.
 
     To specify an easing curve you need to specify at least the type. For some curves you can also specify
@@ -2173,10 +2184,10 @@ void QDeclarative1PropertyAnimation::setProperties(const QString &prop)
 }
 
 /*!
-    \qmlproperty string PropertyAnimation::properties
-    \qmlproperty list<Object> PropertyAnimation::targets
-    \qmlproperty string PropertyAnimation::property
-    \qmlproperty Object PropertyAnimation::target
+    \qmlproperty string QtQuick1::PropertyAnimation::properties
+    \qmlproperty list<Object> QtQuick1::PropertyAnimation::targets
+    \qmlproperty string QtQuick1::PropertyAnimation::property
+    \qmlproperty Object QtQuick1::PropertyAnimation::target
 
     These properties are used as a set to determine which properties should be animated.
     The singular and plural forms are functionally identical, e.g.
@@ -2269,7 +2280,7 @@ QDeclarativeListProperty<QObject> QDeclarative1PropertyAnimation::targets()
 }
 
 /*!
-    \qmlproperty list<Object> PropertyAnimation::exclude
+    \qmlproperty list<Object> QtQuick1::PropertyAnimation::exclude
     This property holds the items not to be affected by this animation.
     \sa PropertyAnimation::targets
 */
@@ -2435,8 +2446,9 @@ void QDeclarative1PropertyAnimation::transition(QDeclarative1StateActions &actio
 
 /*!
     \qmlclass ParentAnimation QDeclarative1ParentAnimation
+    \inqmlmodule QtQuick 1
   \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The ParentAnimation element animates changes in parent values.
 
@@ -2495,7 +2507,7 @@ QDeclarative1ParentAnimation::~QDeclarative1ParentAnimation()
 }
 
 /*!
-    \qmlproperty Item ParentAnimation::target
+    \qmlproperty Item QtQuick1::ParentAnimation::target
     The item to reparent.
 
     When used in a transition, if no target is specified, all
@@ -2518,7 +2530,7 @@ void QDeclarative1ParentAnimation::setTarget(QDeclarativeItem *target)
 }
 
 /*!
-    \qmlproperty Item ParentAnimation::newParent
+    \qmlproperty Item QtQuick1::ParentAnimation::newParent
     The new parent to animate to.
 
     If the ParentAnimation is defined within a \l Transition or \l Behavior,
@@ -2543,7 +2555,7 @@ void QDeclarative1ParentAnimation::setNewParent(QDeclarativeItem *newParent)
 }
 
 /*!
-    \qmlproperty Item ParentAnimation::via
+    \qmlproperty Item QtQuick1::ParentAnimation::via
     The item to reparent via. This provides a way to do an unclipped animation
     when both the old parent and new parent are clipped.
 
@@ -2796,8 +2808,9 @@ QAbstractAnimation *QDeclarative1ParentAnimation::qtAnimation()
 
 /*!
     \qmlclass AnchorAnimation QDeclarative1AnchorAnimation
+    \inqmlmodule QtQuick 1
   \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits Animation
     \brief The AnchorAnimation element animates changes in anchor values.
 
@@ -2839,7 +2852,7 @@ QAbstractAnimation *QDeclarative1AnchorAnimation::qtAnimation()
 }
 
 /*!
-    \qmlproperty list<Item> AnchorAnimation::targets
+    \qmlproperty list<Item> QtQuick1::AnchorAnimation::targets
     The items to reanchor.
 
     If no targets are specified all AnchorChanges will be
@@ -2852,7 +2865,7 @@ QDeclarativeListProperty<QDeclarativeItem> QDeclarative1AnchorAnimation::targets
 }
 
 /*!
-    \qmlproperty int AnchorAnimation::duration
+    \qmlproperty int QtQuick1::AnchorAnimation::duration
     This property holds the duration of the animation, in milliseconds.
 
     The default value is 250.
@@ -2878,10 +2891,10 @@ void QDeclarative1AnchorAnimation::setDuration(int duration)
 }
 
 /*!
-    \qmlproperty enumeration AnchorAnimation::easing.type
-    \qmlproperty real AnchorAnimation::easing.amplitude
-    \qmlproperty real AnchorAnimation::easing.overshoot
-    \qmlproperty real AnchorAnimation::easing.period
+    \qmlproperty enumeration QtQuick1::AnchorAnimation::easing.type
+    \qmlproperty real QtQuick1::AnchorAnimation::easing.amplitude
+    \qmlproperty real QtQuick1::AnchorAnimation::easing.overshoot
+    \qmlproperty real QtQuick1::AnchorAnimation::easing.period
     \brief the easing curve used for the animation.
 
     To specify an easing curve you need to specify at least the type. For some curves you can also specify
diff --git a/src/qtquick1/util/qdeclarativebehavior.cpp b/src/qtquick1/util/qdeclarativebehavior.cpp
index 203f141721..02d1b0eed1 100644
--- a/src/qtquick1/util/qdeclarativebehavior.cpp
+++ b/src/qtquick1/util/qdeclarativebehavior.cpp
@@ -74,8 +74,9 @@ public:
 
 /*!
     \qmlclass Behavior QDeclarative1Behavior
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \brief The Behavior element allows you to specify a default animation for a property change.
 
     A Behavior defines the default animation to be applied whenever a
@@ -110,7 +111,7 @@ QDeclarative1Behavior::~QDeclarative1Behavior()
 }
 
 /*!
-    \qmlproperty Animation Behavior::animation
+    \qmlproperty Animation QtQuick1::Behavior::animation
     \default
 
     This property holds the animation to run when the behavior is triggered.
@@ -151,7 +152,7 @@ void QDeclarative1Behavior::qtAnimationStateChanged(QAbstractAnimation::State ne
 
 
 /*!
-    \qmlproperty bool Behavior::enabled
+    \qmlproperty bool QtQuick1::Behavior::enabled
 
     This property holds whether the behavior will be triggered when the tracked
     property changes value.
diff --git a/src/qtquick1/util/qdeclarativebind.cpp b/src/qtquick1/util/qdeclarativebind.cpp
index bf0802b1d1..f6463be05d 100644
--- a/src/qtquick1/util/qdeclarativebind.cpp
+++ b/src/qtquick1/util/qdeclarativebind.cpp
@@ -74,8 +74,9 @@ public:
 
 /*!
     \qmlclass Binding QDeclarative1Bind
+    \inqmlmodule QtQuick 1
     \ingroup qml-working-with-data
-    \since 4.7
+    \since QtQuick 1.0
     \brief The Binding element allows arbitrary property bindings to be created.
 
     Sometimes it is necessary to bind to a property of an object that wasn't
@@ -108,7 +109,7 @@ QDeclarative1Bind::~QDeclarative1Bind()
 }
 
 /*!
-    \qmlproperty bool Binding::when
+    \qmlproperty bool QtQuick1::Binding::when
 
     This property holds when the binding is active.
     This should be set to an expression that evaluates to true when you want the binding to be active.
@@ -134,7 +135,7 @@ void QDeclarative1Bind::setWhen(bool v)
 }
 
 /*!
-    \qmlproperty Object Binding::target
+    \qmlproperty Object QtQuick1::Binding::target
 
     The object to be updated.
 */
@@ -152,7 +153,7 @@ void QDeclarative1Bind::setObject(QObject *obj)
 }
 
 /*!
-    \qmlproperty string Binding::property
+    \qmlproperty string QtQuick1::Binding::property
 
     The property to be updated.
 */
@@ -170,7 +171,7 @@ void QDeclarative1Bind::setProperty(const QString &p)
 }
 
 /*!
-    \qmlproperty any Binding::value
+    \qmlproperty any QtQuick1::Binding::value
 
     The value to be set on the target object and property.  This can be a
     constant (which isn't very useful), or a bound expression.
diff --git a/src/qtquick1/util/qdeclarativeconnections.cpp b/src/qtquick1/util/qdeclarativeconnections.cpp
index d1d92356ac..5fc019c4c1 100644
--- a/src/qtquick1/util/qdeclarativeconnections.cpp
+++ b/src/qtquick1/util/qdeclarativeconnections.cpp
@@ -74,8 +74,9 @@ public:
 
 /*!
     \qmlclass Connections QDeclarative1Connections
+    \inqmlmodule QtQuick 1
     \ingroup qml-utility-elements
-    \since 4.7
+    \since QtQuick 1.0
     \brief A Connections element describes generalized connections to signals.
 
     A Connections object creates a connection to a QML signal.
@@ -139,7 +140,7 @@ QDeclarative1Connections::~QDeclarative1Connections()
 }
 
 /*!
-    \qmlproperty Object Connections::target
+    \qmlproperty Object QtQuick1::Connections::target
     This property holds the object that sends the signal.
 
     If this property is not set, the \c target defaults to the parent of the Connection.
@@ -174,7 +175,7 @@ void QDeclarative1Connections::setTarget(QObject *obj)
 }
 
 /*!
-    \qmlproperty bool Connections::ignoreUnknownSignals
+    \qmlproperty bool QtQuick1::Connections::ignoreUnknownSignals
 
     Normally, a connection to a non-existent signal produces runtime errors.
 
diff --git a/src/qtquick1/util/qdeclarativefontloader.cpp b/src/qtquick1/util/qdeclarativefontloader.cpp
index 38f7fc6121..25e3132df1 100644
--- a/src/qtquick1/util/qdeclarativefontloader.cpp
+++ b/src/qtquick1/util/qdeclarativefontloader.cpp
@@ -147,8 +147,9 @@ QHash<QUrl, QDeclarative1FontObject*> QDeclarative1FontLoaderPrivate::fonts;
 
 /*!
     \qmlclass FontLoader QDeclarative1FontLoader
+    \inqmlmodule QtQuick 1
   \ingroup qml-utility-elements
-    \since 4.7
+    \since QtQuick 1.0
     \brief The FontLoader element allows fonts to be loaded by name or URL.
 
     The FontLoader element is used to load fonts by name or URL. 
@@ -181,7 +182,7 @@ QDeclarative1FontLoader::~QDeclarative1FontLoader()
 }
 
 /*!
-    \qmlproperty url FontLoader::source
+    \qmlproperty url QtQuick1::FontLoader::source
     The url of the font to load.
 */
 QUrl QDeclarative1FontLoader::source() const
@@ -255,7 +256,7 @@ void QDeclarative1FontLoader::updateFontInfo(const QString& name, QDeclarative1F
 }
 
 /*!
-    \qmlproperty string FontLoader::name
+    \qmlproperty string QtQuick1::FontLoader::name
 
     This property holds the name of the font family.
     It is set automatically when a font is loaded using the \c url property.
@@ -296,7 +297,7 @@ void QDeclarative1FontLoader::setName(const QString &name)
 }
 
 /*!
-    \qmlproperty enumeration FontLoader::status
+    \qmlproperty enumeration QtQuick1::FontLoader::status
 
     This property holds the status of font loading.  It can be one of:
     \list
diff --git a/src/qtquick1/util/qdeclarativelistmodel.cpp b/src/qtquick1/util/qdeclarativelistmodel.cpp
index f9c9ded9b0..5d60ed9658 100644
--- a/src/qtquick1/util/qdeclarativelistmodel.cpp
+++ b/src/qtquick1/util/qdeclarativelistmodel.cpp
@@ -89,8 +89,9 @@ QDeclarative1ListModelParser::ListInstruction *QDeclarative1ListModelParser::Lis
 
 /*!
     \qmlclass ListModel QDeclarative1ListModel
+    \inqmlmodule QtQuick 1
     \ingroup qml-working-with-data
-    \since 4.7
+    \since QtQuick 1.0
     \brief The ListModel element defines a free-form list data source.
 
     The ListModel is a simple container of ListElement definitions, each containing data roles.
@@ -321,7 +322,7 @@ QVariant QDeclarative1ListModel::data(int index, int role) const
 }
 
 /*!
-    \qmlproperty int ListModel::count
+    \qmlproperty int QtQuick1::ListModel::count
     The number of data entries in the model.
 */
 int QDeclarative1ListModel::count() const
@@ -330,7 +331,7 @@ int QDeclarative1ListModel::count() const
 }
 
 /*!
-    \qmlmethod ListModel::clear()
+    \qmlmethod QtQuick1::ListModel::clear()
 
     Deletes all content from the model.
 
@@ -382,7 +383,7 @@ ModelObject_1 *ModelNode::object(const NestedListModel_1 *model)
 }
 
 /*!
-    \qmlmethod ListModel::remove(int index)
+    \qmlmethod QtQuick1::ListModel::remove(int index)
 
     Deletes the content at \a index from the model.
 
@@ -407,7 +408,7 @@ void QDeclarative1ListModel::remove(int index)
 }
 
 /*!
-    \qmlmethod ListModel::insert(int index, jsobject dict)
+    \qmlmethod QtQuick1::ListModel::insert(int index, jsobject dict)
 
     Adds a new item to the list model at position \a index, with the
     values in \a dict.
@@ -441,7 +442,7 @@ void QDeclarative1ListModel::insert(int index, const QScriptValue& valuemap)
 }
 
 /*!
-    \qmlmethod ListModel::move(int from, int to, int n)
+    \qmlmethod QtQuick1::ListModel::move(int from, int to, int n)
 
     Moves \a n items \a from one position \a to another.
 
@@ -485,7 +486,7 @@ void QDeclarative1ListModel::move(int from, int to, int n)
 }
 
 /*!
-    \qmlmethod ListModel::append(jsobject dict)
+    \qmlmethod QtQuick1::ListModel::append(jsobject dict)
 
     Adds a new item to the end of the list model, with the
     values in \a dict.
@@ -507,7 +508,7 @@ void QDeclarative1ListModel::append(const QScriptValue& valuemap)
 }
 
 /*!
-    \qmlmethod object ListModel::get(int index)
+    \qmlmethod object QtQuick1::ListModel::get(int index)
 
     Returns the item at \a index in the list model. This allows the item
     data to be accessed or modified from JavaScript:
@@ -544,7 +545,7 @@ QScriptValue QDeclarative1ListModel::get(int index) const
 }
 
 /*!
-    \qmlmethod ListModel::set(int index, jsobject dict)
+    \qmlmethod QtQuick1::ListModel::set(int index, jsobject dict)
 
     Changes the item at \a index in the list model with the
     values in \a dict. Properties not appearing in \a dict
@@ -589,7 +590,7 @@ void QDeclarative1ListModel::set(int index, const QScriptValue& valuemap, QList<
 }
 
 /*!
-    \qmlmethod ListModel::setProperty(int index, string property, variant value)
+    \qmlmethod QtQuick1::ListModel::setProperty(int index, string property, variant value)
 
     Changes the \a property of the item at \a index in the list model to \a value.
 
@@ -623,7 +624,7 @@ void QDeclarative1ListModel::setProperty(int index, const QString& property, con
 }
 
 /*!
-    \qmlmethod ListModel::sync()
+    \qmlmethod QtQuick1::ListModel::sync()
 
     Writes any unsaved changes to the list model after it has been modified
     from a worker script.
@@ -873,8 +874,9 @@ bool QDeclarative1ListModelParser::definesEmptyList(const QString &s)
 
 /*!
     \qmlclass ListElement QDeclarative1ListElement
+    \inqmlmodule QtQuick 1
     \ingroup qml-working-with-data
-    \since 4.7
+    \since QtQuick 1.0
     \brief The ListElement element defines a data item in a ListModel.
 
     List elements are defined inside ListModel definitions, and represent items in a
diff --git a/src/qtquick1/util/qdeclarativepackage.cpp b/src/qtquick1/util/qdeclarativepackage.cpp
index 989a780f6b..96d94801af 100644
--- a/src/qtquick1/util/qdeclarativepackage.cpp
+++ b/src/qtquick1/util/qdeclarativepackage.cpp
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Package QDeclarative1Package
+    \inqmlmodule QtQuick 1
     \ingroup qml-working-with-data
     \brief Package provides a collection of named items.
 
diff --git a/src/qtquick1/util/qdeclarativepropertychanges.cpp b/src/qtquick1/util/qdeclarativepropertychanges.cpp
index c9a512503b..5882fc5810 100644
--- a/src/qtquick1/util/qdeclarativepropertychanges.cpp
+++ b/src/qtquick1/util/qdeclarativepropertychanges.cpp
@@ -67,8 +67,9 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass PropertyChanges QDeclarative1PropertyChanges
+    \inqmlmodule QtQuick 1
     \ingroup qml-state-elements
-    \since 4.7
+    \since QtQuick 1.0
     \brief The PropertyChanges element describes new property bindings or values for a state.
 
     PropertyChanges is used to define the property values or bindings in a 
@@ -134,7 +135,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty Object PropertyChanges::target
+    \qmlproperty Object QtQuick1::PropertyChanges::target
     This property holds the object which contains the properties to be changed.
 */
 
@@ -396,7 +397,7 @@ void QDeclarative1PropertyChanges::setObject(QObject *o)
 }
 
 /*!
-    \qmlproperty bool PropertyChanges::restoreEntryValues
+    \qmlproperty bool QtQuick1::PropertyChanges::restoreEntryValues
 
     This property holds whether the previous values should be restored when
     leaving the state. 
@@ -498,7 +499,7 @@ QDeclarative1PropertyChanges::ActionList QDeclarative1PropertyChanges::actions()
 }
 
 /*!
-    \qmlproperty bool PropertyChanges::explicit
+    \qmlproperty bool QtQuick1::PropertyChanges::explicit
 
     If explicit is set to true, any potential bindings will be interpreted as
     once-off assignments that occur when the state is entered.
diff --git a/src/qtquick1/util/qdeclarativesmoothedanimation.cpp b/src/qtquick1/util/qdeclarativesmoothedanimation.cpp
index d94c132a56..0bad1a416b 100644
--- a/src/qtquick1/util/qdeclarativesmoothedanimation.cpp
+++ b/src/qtquick1/util/qdeclarativesmoothedanimation.cpp
@@ -252,8 +252,9 @@ void QSmoothedAnimation_1::init()
 
 /*!
     \qmlclass SmoothedAnimation QDeclarative1SmoothedAnimation
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \inherits NumberAnimation
     \brief The SmoothedAnimation element allows a property to smoothly track a value.
 
@@ -381,7 +382,7 @@ void QDeclarative1SmoothedAnimation::transition(QDeclarative1StateActions &actio
 }
 
 /*!
-    \qmlproperty enumeration SmoothedAnimation::reversingMode
+    \qmlproperty enumeration QtQuick1::SmoothedAnimation::reversingMode
 
     Sets how the SmoothedAnimation behaves if an animation direction is reversed.
 
@@ -411,7 +412,7 @@ void QDeclarative1SmoothedAnimation::setReversingMode(ReversingMode m)
 }
 
 /*!
-    \qmlproperty int SmoothedAnimation::duration
+    \qmlproperty int QtQuick1::SmoothedAnimation::duration
 
     This property holds the animation duration, in msecs, used when tracking the source.
 
@@ -444,7 +445,7 @@ qreal QDeclarative1SmoothedAnimation::velocity() const
 }
 
 /*!
-    \qmlproperty real SmoothedAnimation::velocity
+    \qmlproperty real QtQuick1::SmoothedAnimation::velocity
 
     This property holds the average velocity allowed when tracking the 'to' value.
 
@@ -467,7 +468,7 @@ void QDeclarative1SmoothedAnimation::setVelocity(qreal v)
 }
 
 /*!
-    \qmlproperty int SmoothedAnimation::maximumEasingTime
+    \qmlproperty int QtQuick1::SmoothedAnimation::maximumEasingTime
 
     This property specifies the maximum time, in msecs, any "eases" during the follow should take.
     Setting this property causes the velocity to "level out" after at a time.  Setting
diff --git a/src/qtquick1/util/qdeclarativespringanimation.cpp b/src/qtquick1/util/qdeclarativespringanimation.cpp
index 8afa5e7840..6d950c841b 100644
--- a/src/qtquick1/util/qdeclarativespringanimation.cpp
+++ b/src/qtquick1/util/qdeclarativespringanimation.cpp
@@ -237,9 +237,10 @@ void QDeclarative1SpringAnimationPrivate::updateMode()
 
 /*!
     \qmlclass SpringAnimation QDeclarative1SpringAnimation
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
     \inherits NumberAnimation
-    \since 4.7
+    \since QtQuick 1.0
 
     \brief The SpringAnimation element allows a property to track a value in a spring-like motion.
 
@@ -275,7 +276,7 @@ QDeclarative1SpringAnimation::~QDeclarative1SpringAnimation()
 }
 
 /*!
-    \qmlproperty real SpringAnimation::velocity
+    \qmlproperty real QtQuick1::SpringAnimation::velocity
 
     This property holds the maximum velocity allowed when tracking the source.
 
@@ -297,7 +298,7 @@ void QDeclarative1SpringAnimation::setVelocity(qreal velocity)
 }
 
 /*!
-    \qmlproperty real SpringAnimation::spring
+    \qmlproperty real QtQuick1::SpringAnimation::spring
 
     This property describes how strongly the target is pulled towards the
     source. The default value is 0 (that is, the spring-like motion is disabled).
@@ -321,7 +322,7 @@ void QDeclarative1SpringAnimation::setSpring(qreal spring)
 }
 
 /*!
-    \qmlproperty real SpringAnimation::damping
+    \qmlproperty real QtQuick1::SpringAnimation::damping
     This property holds the spring damping value.
 
     This value describes how quickly the spring-like motion comes to rest.
@@ -347,7 +348,7 @@ void QDeclarative1SpringAnimation::setDamping(qreal damping)
 
 
 /*!
-    \qmlproperty real SpringAnimation::epsilon
+    \qmlproperty real QtQuick1::SpringAnimation::epsilon
     This property holds the spring epsilon.
 
     The epsilon is the rate and amount of change in the value which is close enough
@@ -369,7 +370,7 @@ void QDeclarative1SpringAnimation::setEpsilon(qreal epsilon)
 }
 
 /*!
-    \qmlproperty real SpringAnimation::modulus
+    \qmlproperty real QtQuick1::SpringAnimation::modulus
     This property holds the modulus value. The default value is 0.
 
     Setting a \a modulus forces the target value to "wrap around" at the modulus.
@@ -393,7 +394,7 @@ void QDeclarative1SpringAnimation::setModulus(qreal modulus)
 }
 
 /*!
-    \qmlproperty real SpringAnimation::mass
+    \qmlproperty real QtQuick1::SpringAnimation::mass
     This property holds the "mass" of the property being moved.
 
     The value is 1.0 by default.
diff --git a/src/qtquick1/util/qdeclarativestate.cpp b/src/qtquick1/util/qdeclarativestate.cpp
index de6fcd0d86..6d96f8d1f7 100644
--- a/src/qtquick1/util/qdeclarativestate.cpp
+++ b/src/qtquick1/util/qdeclarativestate.cpp
@@ -132,8 +132,9 @@ QDeclarative1StateOperation::QDeclarative1StateOperation(QObjectPrivate &dd, QOb
 
 /*!
     \qmlclass State QDeclarative1State
+    \inqmlmodule QtQuick 1
     \ingroup qml-state-elements
-    \since 4.7
+    \since QtQuick 1.0
     \brief The State element defines configurations of objects and properties.
 
     A \e state is a set of batched changes from the default configuration.
@@ -178,7 +179,7 @@ QDeclarative1State::~QDeclarative1State()
 }
 
 /*!
-    \qmlproperty string State::name
+    \qmlproperty string QtQuick1::State::name
     This property holds the name of the state.
 
     Each state should have a unique name within its item.
@@ -209,7 +210,7 @@ bool QDeclarative1State::isWhenKnown() const
 }
 
 /*!
-    \qmlproperty bool State::when
+    \qmlproperty bool QtQuick1::State::when
     This property holds when the state should be applied.
 
     This should be set to an expression that evaluates to \c true when you want the state to
@@ -247,7 +248,7 @@ void QDeclarative1State::setWhen(QDeclarativeBinding *when)
 }
 
 /*!
-    \qmlproperty string State::extend
+    \qmlproperty string QtQuick1::State::extend
     This property holds the state that this state extends.
 
     When a state extends another state, it inherits all the changes of that state.
@@ -268,7 +269,7 @@ void QDeclarative1State::setExtends(const QString &extends)
 }
 
 /*!
-    \qmlproperty list<Change> State::changes
+    \qmlproperty list<Change> QtQuick1::State::changes
     This property holds the changes to apply for this state
     \default
 
diff --git a/src/qtquick1/util/qdeclarativestategroup.cpp b/src/qtquick1/util/qdeclarativestategroup.cpp
index f04a8d4f03..6bf1a2f23a 100644
--- a/src/qtquick1/util/qdeclarativestategroup.cpp
+++ b/src/qtquick1/util/qdeclarativestategroup.cpp
@@ -90,8 +90,9 @@ public:
 
 /*!
    \qmlclass StateGroup QDeclarative1StateGroup
+    \inqmlmodule QtQuick 1
    \ingroup qml-state-elements
-   \since 4.7
+   \since QtQuick 1.0
    \brief The StateGroup element provides state support for non-Item elements.
 
    Item (and all derived elements) provides built in support for states and transitions
@@ -137,7 +138,7 @@ QList<QDeclarative1State *> QDeclarative1StateGroup::states() const
 }
 
 /*!
-  \qmlproperty list<State> StateGroup::states
+  \qmlproperty list<State> QtQuick1::StateGroup::states
   This property holds a list of states defined by the state group.
 
   \qml
@@ -198,7 +199,7 @@ void QDeclarative1StateGroupPrivate::clear_states(QDeclarativeListProperty<QDecl
 }
 
 /*!
-  \qmlproperty list<Transition> StateGroup::transitions
+  \qmlproperty list<Transition> QtQuick1::StateGroup::transitions
   This property holds a list of transitions defined by the state group.
 
   \qml
@@ -224,7 +225,7 @@ QDeclarativeListProperty<QDeclarative1Transition> QDeclarative1StateGroup::trans
 }
 
 /*!
-  \qmlproperty string StateGroup::state
+  \qmlproperty string QtQuick1::StateGroup::state
 
   This property holds the name of the current state of the state group.
 
diff --git a/src/qtquick1/util/qdeclarativestateoperations.cpp b/src/qtquick1/util/qdeclarativestateoperations.cpp
index 26a8e33f6b..47420f370e 100644
--- a/src/qtquick1/util/qdeclarativestateoperations.cpp
+++ b/src/qtquick1/util/qdeclarativestateoperations.cpp
@@ -172,6 +172,7 @@ void QDeclarative1ParentChangePrivate::doChange(QDeclarativeItem *targetParent,
 /*!
     \preliminary
     \qmlclass ParentChange QDeclarative1ParentChange
+    \inqmlmodule QtQuick 1
     \ingroup qml-state-elements
     \brief The ParentChange element allows you to reparent an Item in a state change.
 
@@ -207,12 +208,12 @@ QDeclarative1ParentChange::~QDeclarative1ParentChange()
 }
 
 /*!
-    \qmlproperty real ParentChange::x
-    \qmlproperty real ParentChange::y
-    \qmlproperty real ParentChange::width
-    \qmlproperty real ParentChange::height
-    \qmlproperty real ParentChange::scale
-    \qmlproperty real ParentChange::rotation
+    \qmlproperty real QtQuick1::ParentChange::x
+    \qmlproperty real QtQuick1::ParentChange::y
+    \qmlproperty real QtQuick1::ParentChange::width
+    \qmlproperty real QtQuick1::ParentChange::height
+    \qmlproperty real QtQuick1::ParentChange::scale
+    \qmlproperty real QtQuick1::ParentChange::rotation
     These properties hold the new position, size, scale, and rotation
     for the item in this state.
 */
@@ -347,7 +348,7 @@ QDeclarativeItem *QDeclarative1ParentChange::originalParent() const
 }
 
 /*!
-    \qmlproperty Item ParentChange::target
+    \qmlproperty Item QtQuick1::ParentChange::target
     This property holds the item to be reparented
 */
 
@@ -364,7 +365,7 @@ void QDeclarative1ParentChange::setObject(QDeclarativeItem *target)
 }
 
 /*!
-    \qmlproperty Item ParentChange::parent
+    \qmlproperty Item QtQuick1::ParentChange::parent
     This property holds the new parent for the item in this state.
 */
 
@@ -601,6 +602,7 @@ public:
 
 /*!
     \qmlclass StateChangeScript QDeclarative1StateChangeScript
+    \inqmlmodule QtQuick 1
     \ingroup qml-state-elements
     \brief The StateChangeScript element allows you to run a script in a state.
 
@@ -623,7 +625,7 @@ QDeclarative1StateChangeScript::~QDeclarative1StateChangeScript()
 }
 
 /*!
-    \qmlproperty script StateChangeScript::script
+    \qmlproperty script QtQuick1::StateChangeScript::script
     This property holds the script to run when the state is current.
 */
 QDeclarativeScriptString QDeclarative1StateChangeScript::script() const
@@ -639,7 +641,7 @@ void QDeclarative1StateChangeScript::setScript(const QDeclarativeScriptString &s
 }
 
 /*!
-    \qmlproperty string StateChangeScript::name
+    \qmlproperty string QtQuick1::StateChangeScript::name
     This property holds the name of the script. This name can be used by a
     ScriptAction to target a specific script.
 
@@ -688,6 +690,7 @@ QString QDeclarative1StateChangeScript::typeName() const
 
 /*!
     \qmlclass AnchorChanges QDeclarative1AnchorChanges
+    \inqmlmodule QtQuick 1
     \ingroup qml-state-elements
     \brief The AnchorChanges element allows you to change the anchors of an item in a state.
 
@@ -1039,7 +1042,7 @@ public:
 };
 
 /*!
-    \qmlproperty Item AnchorChanges::target
+    \qmlproperty Item QtQuick1::AnchorChanges::target
     This property holds the \l Item for which the anchor changes will be applied.
 */
 
@@ -1121,13 +1124,13 @@ void QDeclarative1AnchorChanges::setObject(QDeclarativeItem *target)
 }
 
 /*!
-    \qmlproperty AnchorLine AnchorChanges::anchors.left
-    \qmlproperty AnchorLine AnchorChanges::anchors.right
-    \qmlproperty AnchorLine AnchorChanges::anchors.horizontalCenter
-    \qmlproperty AnchorLine AnchorChanges::anchors.top
-    \qmlproperty AnchorLine AnchorChanges::anchors.bottom
-    \qmlproperty AnchorLine AnchorChanges::anchors.verticalCenter
-    \qmlproperty AnchorLine AnchorChanges::anchors.baseline
+    \qmlproperty AnchorLine QtQuick1::AnchorChanges::anchors.left
+    \qmlproperty AnchorLine QtQuick1::AnchorChanges::anchors.right
+    \qmlproperty AnchorLine QtQuick1::AnchorChanges::anchors.horizontalCenter
+    \qmlproperty AnchorLine QtQuick1::AnchorChanges::anchors.top
+    \qmlproperty AnchorLine QtQuick1::AnchorChanges::anchors.bottom
+    \qmlproperty AnchorLine QtQuick1::AnchorChanges::anchors.verticalCenter
+    \qmlproperty AnchorLine QtQuick1::AnchorChanges::anchors.baseline
 
     These properties change the respective anchors of the item.
 
diff --git a/src/qtquick1/util/qdeclarativesystempalette.cpp b/src/qtquick1/util/qdeclarativesystempalette.cpp
index 311a2bf16e..7f0dde3a93 100644
--- a/src/qtquick1/util/qdeclarativesystempalette.cpp
+++ b/src/qtquick1/util/qdeclarativesystempalette.cpp
@@ -60,8 +60,9 @@ public:
 
 /*!
     \qmlclass SystemPalette QDeclarative1SystemPalette
+    \inqmlmodule QtQuick 1
     \ingroup qml-utility-elements
-    \since 4.7
+    \since QtQuick 1.0
     \brief The SystemPalette element provides access to the Qt palettes.
 
     The SystemPalette element provides access to the Qt application
@@ -96,7 +97,7 @@ QDeclarative1SystemPalette::~QDeclarative1SystemPalette()
 }
 
 /*!
-    \qmlproperty color SystemPalette::window
+    \qmlproperty color QtQuick1::SystemPalette::window
     The window (general background) color of the current color group.
 
     \sa QPalette::ColorRole
@@ -108,7 +109,7 @@ QColor QDeclarative1SystemPalette::window() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::windowText
+    \qmlproperty color QtQuick1::SystemPalette::windowText
     The window text (general foreground) color of the current color group.
 
     \sa QPalette::ColorRole
@@ -120,7 +121,7 @@ QColor QDeclarative1SystemPalette::windowText() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::base
+    \qmlproperty color QtQuick1::SystemPalette::base
     The base color of the current color group.
 
     \sa QPalette::ColorRole
@@ -132,7 +133,7 @@ QColor QDeclarative1SystemPalette::base() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::text
+    \qmlproperty color QtQuick1::SystemPalette::text
     The text color of the current color group.
 
     \sa QPalette::ColorRole
@@ -144,7 +145,7 @@ QColor QDeclarative1SystemPalette::text() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::alternateBase
+    \qmlproperty color QtQuick1::SystemPalette::alternateBase
     The alternate base color of the current color group.
 
     \sa QPalette::ColorRole
@@ -156,7 +157,7 @@ QColor QDeclarative1SystemPalette::alternateBase() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::button
+    \qmlproperty color QtQuick1::SystemPalette::button
     The button color of the current color group.
 
     \sa QPalette::ColorRole
@@ -168,7 +169,7 @@ QColor QDeclarative1SystemPalette::button() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::buttonText
+    \qmlproperty color QtQuick1::SystemPalette::buttonText
     The button text foreground color of the current color group.
 
     \sa QPalette::ColorRole
@@ -180,7 +181,7 @@ QColor QDeclarative1SystemPalette::buttonText() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::light
+    \qmlproperty color QtQuick1::SystemPalette::light
     The light color of the current color group.
 
     \sa QPalette::ColorRole
@@ -192,7 +193,7 @@ QColor QDeclarative1SystemPalette::light() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::midlight
+    \qmlproperty color QtQuick1::SystemPalette::midlight
     The midlight color of the current color group.
 
     \sa QPalette::ColorRole
@@ -204,7 +205,7 @@ QColor QDeclarative1SystemPalette::midlight() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::dark
+    \qmlproperty color QtQuick1::SystemPalette::dark
     The dark color of the current color group.
 
     \sa QPalette::ColorRole
@@ -216,7 +217,7 @@ QColor QDeclarative1SystemPalette::dark() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::mid
+    \qmlproperty color QtQuick1::SystemPalette::mid
     The mid color of the current color group.
 
     \sa QPalette::ColorRole
@@ -228,7 +229,7 @@ QColor QDeclarative1SystemPalette::mid() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::shadow
+    \qmlproperty color QtQuick1::SystemPalette::shadow
     The shadow color of the current color group.
 
     \sa QPalette::ColorRole
@@ -240,7 +241,7 @@ QColor QDeclarative1SystemPalette::shadow() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::highlight
+    \qmlproperty color QtQuick1::SystemPalette::highlight
     The highlight color of the current color group.
 
     \sa QPalette::ColorRole
@@ -252,7 +253,7 @@ QColor QDeclarative1SystemPalette::highlight() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::highlightedText
+    \qmlproperty color QtQuick1::SystemPalette::highlightedText
     The highlighted text color of the current color group.
 
     \sa QPalette::ColorRole
@@ -264,7 +265,7 @@ QColor QDeclarative1SystemPalette::highlightedText() const
 }
 
 /*!
-    \qmlproperty enumeration SystemPalette::colorGroup
+    \qmlproperty enumeration QtQuick1::SystemPalette::colorGroup
 
     The color group of the palette. This can be one of:
 
diff --git a/src/qtquick1/util/qdeclarativetimer.cpp b/src/qtquick1/util/qdeclarativetimer.cpp
index 2456dc06cf..4141ea6759 100644
--- a/src/qtquick1/util/qdeclarativetimer.cpp
+++ b/src/qtquick1/util/qdeclarativetimer.cpp
@@ -72,8 +72,9 @@ public:
 
 /*!
     \qmlclass Timer QDeclarative1Timer
+    \inqmlmodule QtQuick 1
     \ingroup qml-utility-elements
-    \since 4.7
+    \since QtQuick 1.0
     \brief The Timer item triggers a handler at a specified interval.
 
     A Timer can be used to trigger an action either once, or repeatedly
@@ -120,7 +121,7 @@ QDeclarative1Timer::QDeclarative1Timer(QObject *parent)
 }
 
 /*!
-    \qmlproperty int Timer::interval
+    \qmlproperty int QtQuick1::Timer::interval
 
     Sets the \a interval between triggers, in milliseconds.
 
@@ -143,7 +144,7 @@ int QDeclarative1Timer::interval() const
 }
 
 /*!
-    \qmlproperty bool Timer::running
+    \qmlproperty bool QtQuick1::Timer::running
 
     If set to true, starts the timer; otherwise stops the timer.
     For a non-repeating timer, \a running is set to false after the
@@ -171,7 +172,7 @@ void QDeclarative1Timer::setRunning(bool running)
 }
 
 /*!
-    \qmlproperty bool Timer::repeat
+    \qmlproperty bool QtQuick1::Timer::repeat
 
     If \a repeat is true the timer is triggered repeatedly at the
     specified interval; otherwise, the timer will trigger once at the
@@ -198,7 +199,7 @@ void QDeclarative1Timer::setRepeating(bool repeating)
 }
 
 /*!
-    \qmlproperty bool Timer::triggeredOnStart
+    \qmlproperty bool QtQuick1::Timer::triggeredOnStart
 
     When a timer is started, the first trigger is usually after the specified
     interval has elapsed.  It is sometimes desirable to trigger immediately
@@ -231,7 +232,7 @@ void QDeclarative1Timer::setTriggeredOnStart(bool triggeredOnStart)
 }
 
 /*!
-    \qmlmethod Timer::start()
+    \qmlmethod QtQuick1::Timer::start()
     \brief Starts the timer.
 
     If the timer is already running, calling this method has no effect.  The
@@ -243,7 +244,7 @@ void QDeclarative1Timer::start()
 }
 
 /*!
-    \qmlmethod Timer::stop()
+    \qmlmethod QtQuick1::Timer::stop()
     \brief Stops the timer.
 
     If the timer is not running, calling this method has no effect.  The
@@ -255,7 +256,7 @@ void QDeclarative1Timer::stop()
 }
 
 /*!
-    \qmlmethod Timer::restart()
+    \qmlmethod QtQuick1::Timer::restart()
     \brief Restarts the timer.
 
     If the Timer is not running it will be started, otherwise it will be
@@ -300,7 +301,7 @@ void QDeclarative1Timer::componentComplete()
 }
 
 /*!
-    \qmlsignal Timer::onTriggered()
+    \qmlsignal QtQuick1::Timer::onTriggered()
 
     This handler is called when the Timer is triggered.
 */
diff --git a/src/qtquick1/util/qdeclarativetransition.cpp b/src/qtquick1/util/qdeclarativetransition.cpp
index 7a2d4af94e..8498f6c4e2 100644
--- a/src/qtquick1/util/qdeclarativetransition.cpp
+++ b/src/qtquick1/util/qdeclarativetransition.cpp
@@ -55,8 +55,9 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Transition QDeclarative1Transition
+    \inqmlmodule QtQuick 1
     \ingroup qml-animation-transition
-    \since 4.7
+    \since QtQuick 1.0
     \brief The Transition element defines animated transitions that occur on state changes.
 
     A Transition defines the animations to be applied when a \l State change occurs.
@@ -226,8 +227,8 @@ void QDeclarative1Transition::prepare(QDeclarative1StateOperation::ActionList &a
 }
 
 /*!
-    \qmlproperty string Transition::from
-    \qmlproperty string Transition::to
+    \qmlproperty string QtQuick1::Transition::from
+    \qmlproperty string QtQuick1::Transition::to
 
     These properties indicate the state changes that trigger the transition.
 
@@ -265,7 +266,7 @@ void QDeclarative1Transition::setFromState(const QString &f)
 }
 
 /*!
-    \qmlproperty bool Transition::reversible
+    \qmlproperty bool QtQuick1::Transition::reversible
     This property holds whether the transition should be automatically reversed when the conditions that triggered this transition are reversed.
 
     The default value is false.
@@ -321,7 +322,7 @@ void QDeclarative1Transition::setToState(const QString &t)
 }
 
 /*!
-    \qmlproperty list<Animation> Transition::animations
+    \qmlproperty list<Animation> QtQuick1::Transition::animations
     \default
 
     This property holds a list of the animations to be run for this transition.
diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp
index b6ba7a4fcb..396cd399aa 100644
--- a/src/qtquick1/util/qdeclarativeview.cpp
+++ b/src/qtquick1/util/qdeclarativeview.cpp
@@ -191,7 +191,7 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
 
 /*!
     \class QDeclarativeView
-    \since 4.7
+    \since QtQuick 1.0
     \brief The QDeclarativeView class provides a widget for displaying a Qt Declarative user interface.
 
     QDeclarativeItem objects can be placed on a standard QGraphicsScene and
diff --git a/src/qtquick1/util/qdeclarativexmllistmodel.cpp b/src/qtquick1/util/qdeclarativexmllistmodel.cpp
index 1f89f95a34..8beb5d2a94 100644
--- a/src/qtquick1/util/qdeclarativexmllistmodel.cpp
+++ b/src/qtquick1/util/qdeclarativexmllistmodel.cpp
@@ -73,15 +73,16 @@ typedef QPair<int, int> QDeclarative1XmlListRange;
 
 /*!
     \qmlclass XmlRole QDeclarative1XmlListModelRole
+    \inqmlmodule QtQuick 1
     \ingroup qml-working-with-data
-  \since 4.7
+  \since QtQuick 1.0
     \brief The XmlRole element allows you to specify a role for an XmlListModel.
 
     \sa {QtDeclarative}
 */
 
 /*!
-    \qmlproperty string XmlRole::name
+    \qmlproperty string QtQuick1::XmlRole::name
 
     The name for the role. This name is used to access the model data for this role.
 
@@ -108,7 +109,7 @@ typedef QPair<int, int> QDeclarative1XmlListRange;
 */
 
 /*!
-    \qmlproperty string XmlRole::query
+    \qmlproperty string QtQuick1::XmlRole::query
     The relative XPath expression query for this role. The query must be relative; it cannot start
     with a '/'.
 
@@ -126,7 +127,7 @@ typedef QPair<int, int> QDeclarative1XmlListRange;
 */
 
 /*!
-    \qmlproperty bool XmlRole::isKey
+    \qmlproperty bool QtQuick1::XmlRole::isKey
     Defines whether this is a key role.
     
     Key roles are used to to determine whether a set of values should
@@ -487,8 +488,9 @@ void QDeclarative1XmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecl
 
 /*!
     \qmlclass XmlListModel QDeclarative1XmlListModel
+    \inqmlmodule QtQuick 1
     \ingroup qml-working-with-data
-  \since 4.7
+  \since QtQuick 1.0
     \brief The XmlListModel element is used to specify a read-only model using XPath expressions.
 
     XmlListModel is used to create a read-only model from XML data. It can be used as a data source
@@ -596,7 +598,7 @@ QDeclarative1XmlListModel::~QDeclarative1XmlListModel()
 }
 
 /*!
-    \qmlproperty list<XmlRole> XmlListModel::roles
+    \qmlproperty list<XmlRole> QtQuick1::XmlListModel::roles
 
     The roles to make available for this model.
 */
@@ -629,7 +631,7 @@ QVariant QDeclarative1XmlListModel::data(int index, int role) const
 }
 
 /*!
-    \qmlproperty int XmlListModel::count
+    \qmlproperty int QtQuick1::XmlListModel::count
     The number of data entries in the model.
 */
 int QDeclarative1XmlListModel::count() const
@@ -654,7 +656,7 @@ QString QDeclarative1XmlListModel::toString(int role) const
 }
 
 /*!
-    \qmlproperty url XmlListModel::source
+    \qmlproperty url QtQuick1::XmlListModel::source
     The location of the XML data source.
 
     If both \c source and \l xml are set, \l xml is used.
@@ -677,7 +679,7 @@ void QDeclarative1XmlListModel::setSource(const QUrl &src)
 }
 
 /*!
-    \qmlproperty string XmlListModel::xml
+    \qmlproperty string QtQuick1::XmlListModel::xml
     This property holds the XML data for this model, if set.
 
     The text is assumed to be UTF-8 encoded.
@@ -701,7 +703,7 @@ void QDeclarative1XmlListModel::setXml(const QString &xml)
 }
 
 /*!
-    \qmlproperty string XmlListModel::query
+    \qmlproperty string QtQuick1::XmlListModel::query
     An absolute XPath query representing the base query for creating model items
     from this model's XmlRole objects. The query should start with '/' or '//'.
 */
@@ -727,7 +729,7 @@ void QDeclarative1XmlListModel::setQuery(const QString &query)
 }
 
 /*!
-    \qmlproperty string XmlListModel::namespaceDeclarations
+    \qmlproperty string QtQuick1::XmlListModel::namespaceDeclarations
     The namespace declarations to be used in the XPath queries.
 
     The namespaces should be declared as in XQuery. For example, if a requested document
@@ -761,7 +763,7 @@ void QDeclarative1XmlListModel::setNamespaceDeclarations(const QString &declarat
 }
 
 /*!
-    \qmlmethod object XmlListModel::get(int index)
+    \qmlmethod object QtQuick1::XmlListModel::get(int index)
 
     Returns the item at \a index in the model.
 
@@ -801,7 +803,7 @@ QDeclarativeV8Handle QDeclarative1XmlListModel::get(int index) const
 }
 
 /*!
-    \qmlproperty enumeration XmlListModel::status
+    \qmlproperty enumeration QtQuick1::XmlListModel::status
     Specifies the model loading status, which can be one of the following:
 
     \list
@@ -822,7 +824,7 @@ QDeclarative1XmlListModel::Status QDeclarative1XmlListModel::status() const
 }
 
 /*!
-    \qmlproperty real XmlListModel::progress
+    \qmlproperty real QtQuick1::XmlListModel::progress
 
     This indicates the current progress of the downloading of the XML data
     source. This value ranges from 0.0 (no data downloaded) to
@@ -843,7 +845,7 @@ qreal QDeclarative1XmlListModel::progress() const
 }
 
 /*!
-    \qmlmethod void XmlListModel::errorString()
+    \qmlmethod void QtQuick1::XmlListModel::errorString()
 
     Returns a string description of the last error that occurred
     if \l status is XmlListModel::Error.
@@ -868,7 +870,7 @@ void QDeclarative1XmlListModel::componentComplete()
 }
 
 /*!
-    \qmlmethod XmlListModel::reload()
+    \qmlmethod QtQuick1::XmlListModel::reload()
 
     Reloads the model.