diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 13:10:26 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 13:10:26 +0200 |
| commit | a3fd00796dafe52d4ff138b271564daf70d1adee (patch) | |
| tree | 77ca481c06c1b2c3c7822a4cd5864702e341b680 /src/declarative/util/qdeclarativetransition.cpp | |
| parent | 793d1ed8d3a03eefdd487facdacf66ba575e1a07 (diff) | |
| parent | 6aa50af000f85cc4497749fcf0860c8ed244a60e (diff) | |
| download | qt4-tools-a3fd00796dafe52d4ff138b271564daf70d1adee.tar.gz | |
Merge remote branch 'qt/4.7' into lighthouse
Conflicts:
configure
mkspecs/common/qws.conf
src/corelib/io/qresource.cpp
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/opengl/qgl_p.h
src/plugins/mediaservices/gstreamer/gstreamer.pro
Diffstat (limited to 'src/declarative/util/qdeclarativetransition.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativetransition.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index f2841567c6..ab8b116c06 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Transition QDeclarativeTransition - \since 4.7 + \since 4.7 \brief The Transition element defines animated transitions that occur on state changes. \sa {qmlstates}{States}, {state-transitions}{Transitions}, {QtDeclarative} @@ -63,8 +63,6 @@ QT_BEGIN_NAMESPACE \internal \class QDeclarativeTransition \brief The QDeclarativeTransition class allows you to define animated transitions that occur on state changes. - - \ingroup group_states */ //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting |