diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:49:43 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:49:49 (GMT) |
commit | 6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9 (patch) | |
tree | 94da799a697ebf32a98ccc13a53adfb2569f7c16 /src/corelib | |
parent | b664d54867139b371e158f1c63076c4a970cbb2a (diff) | |
parent | 4f2dcef95299f2da628b30607021e8deb1d868b6 (diff) | |
download | Qt-6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9.zip Qt-6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9.tar.gz Qt-6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9.tar.bz2 |
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 10 | ||||
-rw-r--r-- | src/corelib/animation/qsequentialanimationgroup.cpp | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 3065083..013ff7f 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -58,12 +58,12 @@ an example: \code - QPropertyAnimation animation(myWidget, "geometry"); - animation.setDuration(10000); - animation.setStartValue(QRect(0, 0, 100, 30)); - animation.setEndValue(QRect(250, 250, 100, 30)); + QPropertyAnimation *animation = new QPropertyAnimation(myWidget, "geometry"); + animation->setDuration(10000); + animation->setStartValue(QRect(0, 0, 100, 30)); + animation->setEndValue(QRect(250, 250, 100, 30)); - animation.start(); + animation->start(); \endcode The property name and the QObject instance of which property diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp index 861e26e..5dbb8c3 100644 --- a/src/corelib/animation/qsequentialanimationgroup.cpp +++ b/src/corelib/animation/qsequentialanimationgroup.cpp @@ -63,12 +63,12 @@ pause to a sequential animation group. \code - QSequentialAnimationGroup group; + QSequentialAnimationGroup *group = new QSequentialAnimationGroup; - group.addAnimation(anim1); - group.addAnimation(anim2); + group->addAnimation(anim1); + group->addAnimation(anim2); - group.start(); + group->start(); \endcode In this example, \c anim1 and \c anim2 are two already set up |