diff options
Diffstat (limited to 'src/quick/doc/src/concepts/statesanimations/animations.qdoc')
| -rw-r--r-- | src/quick/doc/src/concepts/statesanimations/animations.qdoc | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc index 5867fe9585..9d19a8d9a0 100644 --- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc +++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \ingroup qtquick-transitions-animations @@ -34,7 +10,7 @@ \section1 Animation and Transitions Types \list -\li \l {Transition} - Animates transitions during state changes +\li \l [QML] {Transition} - Animates transitions during state changes \li \l {SequentialAnimation} - Runs animations sequentially \li \l {ParallelAnimation} - Runs animations in parallel \li \l {Behavior} - Specifies a default animation for property changes @@ -145,9 +121,9 @@ values. abrupt property changes; animations smooth transitions to produce visually appealing state changes. -The \l{Transition} type can contain animation types to interpolate property changes -caused by state changes. To assign the transition to an object, bind it to the -\c transitions property. +The \l [QML] {Transition} type can contain animation types to interpolate +property changes caused by state changes. To assign the transition to an object, +bind it to the \c transitions property. A button might have two states, the \c pressed state when the user clicks on the button and a \c released state when the user releases the button. We can assign |