diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2012-11-28 14:08:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 16:21:57 +0100 |
| commit | 7cba8a052fc7d5f6ed6c3bacca82807fff28358c (patch) | |
| tree | 257b022684d35f57654ff70e86f2a596fb5469e5 /src | |
| parent | ca35995c1b46f1ede83cbaf64c3351336de7c4f2 (diff) | |
Make the animation framework docs more framework-agnostic
* (i.e. do not mention Kinetic)
* Add some relevant references to Qt Quick
* Refer to QMetaType::Type instead of the obsolete QVariant::Type
Change-Id: I82b69250c933c7e54dc0c268fa6ce4379726fb0d
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/animation.qdoc | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 89bb6a3ef4..1fd3fe9b2e 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -50,7 +50,7 @@ QPropertyAnimation interpolates over \l{Qt's Property System}{Qt properties}. As property values are stored in \l{QVariant}s, the class inherits QVariantAnimation, and supports animation of the - same \l{QVariant::Type}{variant types} as its super class. + same \l{QMetaType::Type}{meta types} as its super class. A class declaring properties must be a QObject. To make it possible to animate a property, it must provide a setter (so that diff --git a/src/corelib/doc/src/animation.qdoc b/src/corelib/doc/src/animation.qdoc index 3b5486c605..e71ee6b755 100644 --- a/src/corelib/doc/src/animation.qdoc +++ b/src/corelib/doc/src/animation.qdoc @@ -45,11 +45,14 @@ \keyword Animation - The animation framework is part of the Kinetic project, and aims - to provide an easy way for creating animated and smooth GUI's. By - animating Qt properties, the framework provides great freedom for - animating widgets and other \l{QObject}s. The framework can also - be used with the Graphics View framework. + The animation framework aims to provide an easy way for creating animated + and smooth GUI's. By animating Qt properties, the framework provides great + freedom for animating widgets and other \l{QObject}s. The framework can + also be used with the Graphics View framework. Many of the concepts + available in the animation framework are also available in \l{Qt Quick}, + where it offers a declarative way of defining animations. Much of the + knowledge acquired about the animation framework can be applied to + \l{Qt Quick}. In this overview, we explain the basics of its architecture. We also show examples of the most common techniques that the |