aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2012-05-28 19:40:02 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-06 06:27:41 +0200
commitca6d49e6b4096f5a9737c6aee04e9b22a781aba2 (patch)
tree5fabb7125253062e4f36490e151a6fad064f82b5 /src/quick/util
parent2896a434715d70c73409042d78ecc2e92b8b093b (diff)
Doc: Grouped Qt Quick types into several groups
-created new groups and converted some overviews into group pages -edited type documentation and added \ingroup -articles still need title fixes and link fixes Groups: qtquick-visual-types qtquick-item-graphics qtquick-shaders qtquick-canvas qtquick-text qtquick-text-validator qtquick-interaction qtquick-positioners qtquick-transformations qtquick-states qtquick-animation-define qtquick-animation-properties qtquick-animation-control qtquick-animation-modifiers qtquick-images-sprites qtquick-images qtquick-models qtquick-containers qtquick-views qtquick-paths qtquick-utility Task: QTBUG-25685 Change-Id: I81d4df3320bf5daad5cabb5e42408013fb24f464 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/quick/util')
-rw-r--r--src/quick/util/qquickanimation.cpp22
-rw-r--r--src/quick/util/qquickanimationcontroller.cpp2
-rw-r--r--src/quick/util/qquickbehavior.cpp2
-rw-r--r--src/quick/util/qquickbind.cpp2
-rw-r--r--src/quick/util/qquickconnections.cpp4
-rw-r--r--src/quick/util/qquickfontloader.cpp10
-rw-r--r--src/quick/util/qquickpackage.cpp20
-rw-r--r--src/quick/util/qquickpath.cpp24
-rw-r--r--src/quick/util/qquickpathinterpolator.cpp1
-rw-r--r--src/quick/util/qquickpropertychanges.cpp2
-rw-r--r--src/quick/util/qquicksmoothedanimation.cpp2
-rw-r--r--src/quick/util/qquickspringanimation.cpp2
-rw-r--r--src/quick/util/qquickstate.cpp8
-rw-r--r--src/quick/util/qquickstatechangescript.cpp2
-rw-r--r--src/quick/util/qquickstategroup.cpp12
-rw-r--r--src/quick/util/qquicksystempalette.cpp4
-rw-r--r--src/quick/util/qquicktimer.cpp2
-rw-r--r--src/quick/util/qquicktransition.cpp2
18 files changed, 62 insertions, 61 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 33c24f38d7..8162aaeee3 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass Animation QQuickAbstractAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-properties
\brief Is the base of all QML animations
The Animation element cannot be used directly in a QML file. It exists
@@ -617,7 +617,7 @@ void QQuickAbstractAnimationPrivate::animationFinished(QAbstractAnimationJob*)
/*!
\qmlclass PauseAnimation QQuickPauseAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-modifiers
\inherits Animation
\brief Provides a pause for an animation
@@ -687,7 +687,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
/*!
\qmlclass ColorAnimation QQuickColorAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-properties
\inherits PropertyAnimation
\brief Animates changes in color values
@@ -831,7 +831,7 @@ void QActionAnimation::updateState(State newState, State oldState)
/*!
\qmlclass ScriptAction QQuickScriptAction
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-modifiers
\inherits Animation
\brief Defines scripts to be run during an animation
@@ -957,7 +957,7 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action
/*!
\qmlclass PropertyAction QQuickPropertyAction
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-modifiers
\inherits Animation
\brief Specifies immediate property changes during animation
@@ -1209,7 +1209,7 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti
/*!
\qmlclass NumberAnimation QQuickNumberAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-properties
\inherits PropertyAnimation
\brief Animates changes in qreal-type values
@@ -1321,7 +1321,7 @@ void QQuickNumberAnimation::setTo(qreal t)
/*!
\qmlclass Vector3dAnimation QQuickVector3dAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-properties
\inherits PropertyAnimation
\brief Animates changes in QVector3d values
@@ -1397,7 +1397,7 @@ void QQuickVector3dAnimation::setTo(QVector3D t)
/*!
\qmlclass RotationAnimation QQuickRotationAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-properties
\inherits PropertyAnimation
\brief Animates changes in rotation values
@@ -1637,7 +1637,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
/*!
\qmlclass SequentialAnimation QQuickSequentialAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-define
\inherits Animation
\brief Allows animations to be run sequentially
@@ -1710,7 +1710,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
/*!
\qmlclass ParallelAnimation QQuickParallelAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-define
\inherits Animation
\brief Enables animations to be run in parallel
@@ -1836,7 +1836,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
/*!
\qmlclass PropertyAnimation QQuickPropertyAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \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 f81b39c8a8..4cfee6d11f 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -94,7 +94,7 @@ void QQuickAnimationControllerPrivate::animationCurrentTimeChanged(QAbstractAnim
/*!
\qmlclass AnimationController QQuickAnimationController
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-control
\brief Enables manual control of animations
Normally animations are driven by an internal timer, but the AnimationController
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 4aa3d17c0e..0de99d4db1 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -75,7 +75,7 @@ public:
/*!
\qmlclass Behavior QQuickBehavior
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-define
\brief Defines a default animation for a property change
A Behavior defines the default animation to be applied whenever a
diff --git a/src/quick/util/qquickbind.cpp b/src/quick/util/qquickbind.cpp
index 81377bf778..bd57efb29b 100644
--- a/src/quick/util/qquickbind.cpp
+++ b/src/quick/util/qquickbind.cpp
@@ -77,7 +77,7 @@ public:
/*!
\qmlclass Binding QQuickBind
\inqmlmodule QtQuick 2
- \ingroup qml-working-with-data
+ \ingroup qtquick-utility
\brief Enables the arbitrary creation of property bindings
\section1 Binding to an inaccessible property
diff --git a/src/quick/util/qquickconnections.cpp b/src/quick/util/qquickconnections.cpp
index bbc7a8dec8..6a20e31821 100644
--- a/src/quick/util/qquickconnections.cpp
+++ b/src/quick/util/qquickconnections.cpp
@@ -73,7 +73,7 @@ public:
/*!
\qmlclass Connections QQuickConnections
\inqmlmodule QtQuick 2
- \ingroup qml-utility-elements
+ \ingroup qtquick-utility
\brief Describes generalized connections to signals
A Connections object creates a connection to a QML signal.
@@ -87,7 +87,7 @@ public:
}
\endqml
- However, it is not possible to connect to a signal in this way in some
+ However, it is not possible to connect to a signal in this way in some
cases, such as when:
\list
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index e2863776f5..7e5f3de9af 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -148,19 +148,19 @@ QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts;
/*!
\qmlclass FontLoader QQuickFontLoader
\inqmlmodule QtQuick 2
- \ingroup qml-utility-elements
+ \ingroup qtquick-utility
\brief Allows fonts to be loaded by name or URL
- The FontLoader element is used to load fonts by name or URL.
-
- The \l status indicates when the font has been loaded, which is useful
+ The FontLoader element is used to load fonts by name or URL.
+
+ The \l status indicates when the font has been loaded, which is useful
for fonts loaded from remote sources.
For example:
\qml
import QtQuick 2.0
- Column {
+ Column {
FontLoader { id: fixedFont; name: "Courier" }
FontLoader { id: webFont; source: "http://www.mysite.com/myfont.ttf" }
diff --git a/src/quick/util/qquickpackage.cpp b/src/quick/util/qquickpackage.cpp
index ede1c68d02..059a55ea88 100644
--- a/src/quick/util/qquickpackage.cpp
+++ b/src/quick/util/qquickpackage.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass Package QQuickPackage
\inqmlmodule QtQuick 2
- \ingroup qml-working-with-data
+ \ingroup qtquick-views
\brief Specifies a collection of named items
The Package class is used in conjunction with
@@ -128,14 +128,14 @@ QQuickPackageAttached::~QQuickPackageAttached()
attached.remove(parent());
}
-QString QQuickPackageAttached::name() const
-{
- return _name;
+QString QQuickPackageAttached::name() const
+{
+ return _name;
}
-void QQuickPackageAttached::setName(const QString &n)
-{
- _name = n;
+void QQuickPackageAttached::setName(const QString &n)
+{
+ _name = n;
}
QQuickPackage::QQuickPackage(QObject *parent)
@@ -150,9 +150,9 @@ QQuickPackage::~QQuickPackage()
QQmlListProperty<QObject> QQuickPackage::data()
{
Q_D(QQuickPackage);
- return QQmlListProperty<QObject>(this, &d->dataList, QQuickPackagePrivate::data_append,
- QQuickPackagePrivate::data_count,
- QQuickPackagePrivate::data_at,
+ return QQmlListProperty<QObject>(this, &d->dataList, QQuickPackagePrivate::data_append,
+ QQuickPackagePrivate::data_count,
+ QQuickPackagePrivate::data_at,
QQuickPackagePrivate::data_clear);
}
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index cce412a851..b1adfe3d68 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass PathElement QQuickPathElement
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief PathElement is the base path type
This type is the base for all path types. It cannot
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass Path QQuickPath
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Defines a path for use by \l PathView
A Path is composed of one or more path segments - PathLine, PathQuad,
@@ -805,7 +805,7 @@ bool QQuickCurve::hasRelativeY()
/*!
\qmlclass PathAttribute QQuickPathAttribute
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Specifies how to set an attribute at a given position in a Path
The PathAttribute object allows attributes consisting of a name and
@@ -921,7 +921,7 @@ void QQuickPathAttribute::setValue(qreal value)
/*!
\qmlclass PathLine QQuickPathLine
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Defines a straight line
The example below creates a path consisting of a straight line from
@@ -979,7 +979,7 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
/*!
\qmlclass PathQuad QQuickPathQuad
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Defines a quadratic Bezier curve with a control point
The following QML produces the path shown below:
@@ -1128,10 +1128,10 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data)
/****************************************************************************/
/*!
- \qmlclass PathCubic QQuickPathCubic
+ \qmlclass PathCubic QQuickPathCubic
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
- \brief Defines a cubic Bezier curve with two control points
+ \ingroup qtquick-paths
+ \brief Defines a cubic Bezier curve with two control points
The following QML produces the path shown below:
\table
@@ -1353,7 +1353,7 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data)
/*!
\qmlclass PathCurve QQuickPathCurve
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Defines a point on a Catmull-Rom curve
PathCurve provides an easy way to specify a curve passing directly through a set of points.
@@ -1498,7 +1498,7 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa
/*!
\qmlclass PathArc QQuickPathArc
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Defines an arc with the given radius
PathArc provides a simple way of specifying an arc that ends at a given position
@@ -1668,7 +1668,7 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data)
/*!
\qmlclass PathSvg QQuickPathSvg
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Defines a path using an SVG path data string
The following QML produces the path shown below:
@@ -1720,7 +1720,7 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &)
/*!
\qmlclass PathPercent QQuickPathPercent
\inqmlmodule QtQuick 2
- \ingroup qml-view-elements
+ \ingroup qtquick-paths
\brief Manipulates the way a path is interpreted
PathPercent allows you to manipulate the spacing between items on a
diff --git a/src/quick/util/qquickpathinterpolator.cpp b/src/quick/util/qquickpathinterpolator.cpp
index 62bb9c1a10..1430f72058 100644
--- a/src/quick/util/qquickpathinterpolator.cpp
+++ b/src/quick/util/qquickpathinterpolator.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass PathInterpolator QQuickPathInterpolator
\inqmlmodule QtQuick 2
+ \ingroup qtquick-animation-control
\brief Specifies how to manually animate along a path
PathInterpolator provides \c x, \c y, and \c angle information for a particular \c progress
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 969c326b97..b51eefcd4e 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass PropertyChanges QQuickPropertyChanges
\inqmlmodule QtQuick 2
- \ingroup qml-state-elements
+ \ingroup qtquick-states
\brief Describes new property bindings or values for a state
PropertyChanges is used to define the property values or bindings in a
diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 4bc802cded..b4986c0479 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -309,7 +309,7 @@ void QSmoothedAnimation::init()
/*!
\qmlclass SmoothedAnimation QQuickSmoothedAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-properties
\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 1f6e51e2b9..3e0a1ce755 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -342,7 +342,7 @@ void QQuickSpringAnimationPrivate::updateMode()
/*!
\qmlclass SpringAnimation QQuickSpringAnimation
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-properties
\inherits NumberAnimation
\brief Allows a property to track a value in a spring-like motion
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index da4dde5af3..f6802b1f43 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -61,7 +61,7 @@ QQuickAction::QQuickAction()
QQuickAction::QQuickAction(QObject *target, const QString &propertyName,
const QVariant &value)
-: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false),
+: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false),
property(target, propertyName, qmlEngine(target)), toValue(value),
fromBinding(0), event(0),
specifiedObject(target), specifiedProperty(propertyName)
@@ -122,7 +122,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
/*!
\qmlclass State QQuickState
\inqmlmodule QtQuick 2
- \ingroup qml-state-elements
+ \ingroup qtquick-states
\brief Defines configurations of objects and properties
A \e state is a set of batched changes from the default configuration.
@@ -665,7 +665,7 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert)
}
if (!found) {
QVariant cur = d->revertList.at(ii).property().read();
- QQmlAbstractBinding *delBinding =
+ QQmlAbstractBinding *delBinding =
QQmlPropertyPrivate::setBinding(d->revertList.at(ii).property(), 0);
if (delBinding)
delBinding->destroy();
@@ -700,7 +700,7 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert)
qWarning() << " QQuickAction event:" << action.event->type();
else
qWarning() << " QQuickAction:" << action.property.object()
- << action.property.name() << "From:" << action.fromValue
+ << action.property.name() << "From:" << action.fromValue
<< "To:" << action.toValue;
}
}
diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp
index 49db12740c..19bd21f3d4 100644
--- a/src/quick/util/qquickstatechangescript.cpp
+++ b/src/quick/util/qquickstatechangescript.cpp
@@ -70,7 +70,7 @@ public:
/*!
\qmlclass StateChangeScript QQuickStateChangeScript
\inqmlmodule QtQuick 2
- \ingroup qml-state-elements
+ \ingroup qtquick-states
\brief Specifies how to run a script in a state
A StateChangeScript is run upon entering a state. You can optionally use
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index 6e88ec55aa..2d8ed951fb 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -94,7 +94,7 @@ public:
/*!
\qmlclass StateGroup QQuickStateGroup
\inqmlmodule QtQuick 2
- \ingroup qml-state-elements
+ \ingroup qtquick-states
\brief Provides built-in state support for non-Item elements
Item (and all derived elements) provides built in support for states and transitions
@@ -339,8 +339,8 @@ bool QQuickStateGroupPrivate::updateAutoState()
if (state->isWhenKnown()) {
if (state->isNamed()) {
if (state->when() && state->when()->evaluate().toBool()) {
- if (stateChangeDebug())
- qWarning() << "Setting auto state due to:"
+ if (stateChangeDebug())
+ qWarning() << "Setting auto state due to:"
<< state->when()->expression();
if (currentState != state->name()) {
q->setState(state->name());
@@ -377,7 +377,7 @@ QQuickTransition *QQuickStateGroupPrivate::findTransition(const QString &from, c
for (int ii = 0; ii < 2; ++ii)
{
if (ii && (!t->reversible() ||
- (t->fromState() == QLatin1String("*") &&
+ (t->fromState() == QLatin1String("*") &&
t->toState() == QLatin1String("*"))))
break;
QStringList fromState;
@@ -428,7 +428,7 @@ QQuickTransition *QQuickStateGroupPrivate::findTransition(const QString &from, c
return highest;
}
-void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
+void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
bool ignoreTrans)
{
Q_Q(QQuickStateGroup);
@@ -448,7 +448,7 @@ void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state,
if (stateChangeDebug()) {
qWarning() << this << "Changing state. From" << currentState << ". To" << state;
if (transition)
- qWarning() << " using transition" << transition->fromState()
+ qWarning() << " using transition" << transition->fromState()
<< transition->toState();
}
diff --git a/src/quick/util/qquicksystempalette.cpp b/src/quick/util/qquicksystempalette.cpp
index cc3a618faf..1cbde6ef5a 100644
--- a/src/quick/util/qquicksystempalette.cpp
+++ b/src/quick/util/qquicksystempalette.cpp
@@ -59,11 +59,11 @@ public:
/*!
\qmlclass SystemPalette QQuickSystemPalette
\inqmlmodule QtQuick 2
- \ingroup qml-utility-elements
+ \ingroup qtquick-utility
\brief Provides access to the Qt palettes
The SystemPalette element provides access to the Qt application
- palettes. This provides information about the standard colors used
+ palettes. This provides information about the standard colors used
for application windows, buttons and other features. These colors
are grouped into three \e {color groups}: \c Active, \c Inactive,
and \c Disabled. See the QPalette documentation for details about
diff --git a/src/quick/util/qquicktimer.cpp b/src/quick/util/qquicktimer.cpp
index fff3e80202..84ede7b038 100644
--- a/src/quick/util/qquicktimer.cpp
+++ b/src/quick/util/qquicktimer.cpp
@@ -75,7 +75,7 @@ public:
/*!
\qmlclass Timer QQuickTimer
\inqmlmodule QtQuick 2
- \ingroup qml-utility-elements
+ \ingroup qtquick-utility
\brief Triggers a handler at a specified interval
A Timer can be used to trigger an action either once, or repeatedly
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index 3f56145566..2431642082 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass Transition QQuickTransition
\inqmlmodule QtQuick 2
- \ingroup qml-animation-transition
+ \ingroup qtquick-animation-define
\brief Defines animated transitions that occur on state changes
A Transition defines the animations to be applied when a \l State change occurs.