summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativeanimation.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Converting accidental use of doubles to qreal in declarativemread2011-10-051-1/+1
| | | | | | | | | | | | | Declarative had a number of places where double operations were used instead of qreal, due to the use of double literals. These are now constructed as qreal literals so that qreal operations are used. This makes no difference where qreal is double. But on Symbian, qreal is float, and this give a performance boost for floating point intensive code. Task-number: QTBUG-4894 Reviewed-by: Martin Jones
* QDeclarative: fixed clean animation listsChristiaan Janssen2011-05-311-3/+7
| | | | Change-Id: I9dd8b4fcd3f04193410710981a511b9f69e5dc19
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-86/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-03-271-86/+86
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
| | * Merge branch 'mimir' into 4.7Martin Smith2011-03-011-1/+1
| | |\
| | | * qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-1/+1
| | | |
| | * | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-231-4/+6
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| | * | Doc: Fixed links and whitespace.David Boddie2011-02-171-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-041-36/+24
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-171-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
| | * | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-85/+85
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Fix memory leak.Martin Jones2011-03-241-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I919935399ee1b0e505c85781d481d17345df25c9 Task-number: QT-4330 Reviewed-by: Michael Brasser
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-4/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-36/+24
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: tools/qml/qml.pri
| * | | | Fix animations with alwaysRunToEnd that are frequently stopped/started.Michael Brasser2011-02-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous refactoring of the animation logic introduced a regression -- 'restart' rather than 'continue' behavior. Change-Id: I8ade2286298fad48f5e268793a0b2571884bc5d0 Task-number: QTBUG-16736 Reviewed-by: Martin Jones
| * | | | Prevent an animation from being registered to run twice.Michael Brasser2011-02-221-3/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This could cause animations to start running that could not later be stopped. Change-Id: I320f50121f3566619f08181664d049b02e2848e5 Reviewed-by: Martin Jones
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-36/+24
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-261-1/+1
| | | |
| * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-261-9/+4
| | | |
| * | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211-26/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-26/+19
| | |/ /
| * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-211-1/+3
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-4/+4
|\ \ | |/ | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * Fixed incorrect angle values in the RotationAnimation description.David Boddie2010-11-301-4/+4
| | | | | | | | Task-number: QTBUG-15696
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Doc clarification.Michael Brasser2010-09-301-0/+2
| | | | | | | | Task-number: QTBUG-14053
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-1/+8
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-2/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * In ParentChange treat flip in x and y as a 180 degree rotationMartin Jones2010-09-141-2/+3
| | | | | | | | | | | | | | The two are equivalent, but flip doesn't work in ParentChange. Task-number: QTBUG-13554 Reviewed-by: Michael Brasser
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * QDeclarative: Fix spelling mistake.Christian Kandeler2010-09-011-1/+1
| |
* | Compilation on S60 of external projects depending on private headersEskil Abrahamsen Blomfeldt2010-09-021-0/+4
|/ | | | | | | | | Minor change to allow external projects to include qdeclarativeanimation_p_p.h and still compile on Symbian. The inlined constructor with a templated object that contains a call to an non-exported function (execute()) caused a linker error. Reviewed-by: bnilsen
* Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-271-53/+1
|
* Docs - clarify use of PropertyChanges for immediate property changes inBea Lam2010-08-171-50/+119
| | | | | a State (e.g. for setting a transformOrigin for a RotationAnimation). Also improve some other animation docs in general.
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+13
| | | | ...and a set of functional group pages.
* Clear previous animation data for non-triggering animations.Michael Brasser2010-08-131-0/+2
| | | | | | | We need to clear the data from the last run if the animation doesn't match any of the state actions (or if there are no actions). Task-number: QTBUG-12805
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-061-15/+35
|\ | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| * Improve docs on QML Animation page and associated elementsBea Lam2010-08-051-16/+36
| | | | | | | | Task-number: QTBUG-12666
* | Doc: Fixed qdoc warnings.David Boddie2010-08-051-1/+1
|/ | | | Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-301-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing image Mention scope of id uniqueness Update QML Documents example add license header doc: Add a note about QCoreApplication::applicationDirPath Add license header Add moving and flicking properties to PathView Improve utility of QMLViewer Add missing \l doc commands Document elements that are focus scopes. Remove use of shared NOTIFY signals in QGraphicsScale Remove use of shared NOTIFY signals
| * Remove use of shared NOTIFY signalsMartin Jones2010-07-291-4/+4
| | | | | | | | | | | | | | | | | | Sharing a NOTIFY signal can cause binding loop warnings with no apparent cause. Task-number: QTBUG-12333 Reviewed-by: Aaron Kennedy Reviewed-by: Michael Brasser
* | Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-291-7/+7
|/ | | | QTBUG-11938 and QTBUG-10801
* Document that animations have to be started/stopped as a groupBea Lam2010-07-271-0/+8
|
* Remove unneeded member variable.Michael Brasser2010-07-221-4/+3
|
* various doc improvements for animation elementsBea Lam2010-07-201-125/+132
|