diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-05-28 17:12:56 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 09:58:56 +0200 |
| commit | 5e33b0f580d2b20f1a2989bf2ee8dde4525a2e39 (patch) | |
| tree | 780d25ce7d8955e56ea985a35dd84609df12fbf0 /src/quick/util/qquickanimation.cpp | |
| parent | 03342a435a88656d64d1445991a4421d244fcb45 (diff) | |
Create new documentation structure
The documentation currently has no clear separation between Qt QML
and Qt Quick. With recent commits like:
6c8378eaf1edbbefe6aaa3672b0127816a004fd7
and
ab1e510121c8a679fdaca12ccd30e0f7ac12a26b
the separation between the language definition and implementation,
provided by Qt QML, and the standard library for the QML language,
provided by Qt Quick, is clear.
This commit creates a new documentation structure that is more
navigable and separates concepts into logical categories, with
clear separation between QtQML and QtQuick. It also provides a more
generic QML Application Developer Resources page which contains links
to information for QML application developers.
Change-Id: Ia807ccfbfd24ffa0e1c7f0a51ed9d2ed3aa6a733
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/util/qquickanimation.cpp')
| -rw-r--r-- | src/quick/util/qquickanimation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 8162aaeee3..ebdde58c63 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 qtquick-animation-properties + \ingroup qtquick-transitions-animations \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 qtquick-animation-modifiers + \ingroup qtquick-transitions-animations \inherits Animation \brief Provides a pause for an animation @@ -831,7 +831,7 @@ void QActionAnimation::updateState(State newState, State oldState) /*! \qmlclass ScriptAction QQuickScriptAction \inqmlmodule QtQuick 2 - \ingroup qtquick-animation-modifiers + \ingroup qtquick-transitions-animations \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 qtquick-animation-modifiers + \ingroup qtquick-transitions-animations \inherits Animation \brief Specifies immediate property changes during animation @@ -1637,7 +1637,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations() /*! \qmlclass SequentialAnimation QQuickSequentialAnimation \inqmlmodule QtQuick 2 - \ingroup qtquick-animation-define + \ingroup qtquick-transitions-animations \inherits Animation \brief Allows animations to be run sequentially @@ -1710,7 +1710,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions /*! \qmlclass ParallelAnimation QQuickParallelAnimation \inqmlmodule QtQuick 2 - \ingroup qtquick-animation-define + \ingroup qtquick-transitions-animations \inherits Animation \brief Enables animations to be run in parallel |