summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-203-5/+32
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-202-0/+5
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-201-0/+4
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Add missing docs.Michael Brasser2009-07-201-0/+4
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-171-6/+3
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: demos/declarative/samegame/content/BoomBlock.qml
| | * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-173-112/+40
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-162-0/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Fix a bug in QmlFollowAlan Alpert2009-07-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using a follow by turning it on and off at times was not working right.
| * | | | | Add an inSync property that holds whether the target has "caught up"Martin Jones2009-07-202-5/+27
| | |_|_|/ | |/| | | | | | | | | | | | | Useful for determining when the target has finished animating.
* | | | | Rename QmlBindableValue to QmlBindingAaron Kennedy2009-07-2013-23/+18
|/ / / /
* | | | Minor cleanup.Michael Brasser2009-07-171-6/+3
| |_|/ |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-162-48/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/fx/qfxitem.h src/declarative/util/qfxview.h src/gui/graphicsview/qgraphicsitem_p.h
| * | | Add an errors() signal to QFxViewKai Koehne2009-07-162-48/+18
| | |/ | |/| | | | | | | This is in addition to the logging to the console. Discussed with Aaron.
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-162-14/+55
|\ \ \ | |/ / | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/fx/fx.pri
| * | Add QmlPalette::darker() and QmlPalette::lighter().Yann Bodson2009-07-162-0/+13
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-154-3/+340
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Make QmlPalette properties notifiable.Yann Bodson2009-07-152-14/+42
| | | | | | | | | | | | Handle palette changes in QmlPalette.
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-158-4/+618
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvasdebugplugin.cpp src/declarative/canvas/qsimplecanvasdebugplugin_p.h src/declarative/fx/qfxpainteditem.cpp src/declarative/util/qfxview.cpp tools/qmlviewer/qmlviewer.h
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-141-3/+2
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-145-12/+278
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/parser/qmljsparser.cpp
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-0913-55/+1273
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp
| | * | | Allow relative URLsWarwick Allison2009-07-091-3/+2
| | | | |
| * | | | Update .pri for QmlTimer move.Martin Jones2009-07-141-0/+2
| | | | |
| * | | | Move QmlTimer to util/Martin Jones2009-07-142-0/+336
| | |_|/ | |/| |
| * | | Doc (fixed typo)Kai Koehne2009-07-141-1/+1
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-141-11/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Merge commit 'c1491ff950f7da733c21bd3f00b88309397cf622' into HEAD
| | * | | Compile.Bjørn Erik Nilsen2009-07-141-1/+1
| | | | |
| * | | | Add access to Qt palettes from QML.Yann Bodson2009-07-143-0/+276
| | |_|/ | |/| |
* | | | Add experimental FocusRealm support.Michael Brasser2009-07-151-1/+1
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-131-13/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/canvas/qsimplecanvas_graphicsview.cpp src/declarative/canvas/qsimplecanvas_p.h src/declarative/util/qfxview.cpp src/gui/graphicsview/qgraphicsitem_p.h
| * | | Start moving debugger out of processAaron Kennedy2009-07-131-10/+0
| |/ /
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-1046-2532/+2241
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: examples/itemviews/frozencolumn/main.cpp src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvas_p.h src/declarative/canvas/qsimplecanvasitem.h src/declarative/extra/qfxparticles.cpp src/declarative/fx/fx.pri src/declarative/fx/qfxblurfilter.h src/declarative/fx/qfxcontentwrapper.cpp src/declarative/fx/qfxflickable.cpp src/declarative/fx/qfxfocuspanel.h src/declarative/fx/qfxfocusrealm.h src/declarative/fx/qfxhighlightfilter.cpp src/declarative/fx/qfxhighlightfilter.h src/declarative/fx/qfximage.cpp src/declarative/fx/qfxitem.cpp src/declarative/fx/qfxitem.h src/declarative/fx/qfxrect.cpp src/declarative/fx/qfxreflectionfilter.h src/declarative/fx/qfxshadowfilter.cpp src/declarative/fx/qfxshadowfilter.h src/declarative/fx/qfxtext.cpp src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.cpp src/declarative/opengl/glbasicshaders.h src/declarative/test/qfxtestengine.cpp src/declarative/test/qfxtestengine.h src/declarative/test/qfxtestobjects.cpp src/declarative/test/qfxtestobjects.h src/declarative/test/qfxtestview.h src/declarative/util/qfxglobal.h src/declarative/util/qfxview.cpp src/gui/graphicsview/qgraphicsitem_p.h tools/qmlviewer/qmlviewer.cpp
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-082-13/+18
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Fix custom string convertors for animations.Michael Brasser2009-07-081-1/+1
| | | |
| | * | Support custom string convertors for animations.Michael Brasser2009-07-082-13/+18
| | | |
| * | | Add a modulus property to Follow to allow "wrapping".Martin Jones2009-07-082-5/+56
| |/ / | | | | | | | | | Also add clock example to demonstrate.
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-0211-393/+346
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-026-73/+70
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Remove QmlSetPropertyAaron Kennedy2009-07-0111-393/+346
| | | | | | | | | | | | | | | | This involves the introduction of separation between states and transition application. This was necessary to allow layouts to continue to use transitions.
| * | | Make performance logging classes private.Michael Brasser2009-07-027-8/+19
| | | |
| * | | Move timeline class to util and make private.Michael Brasser2009-07-024-1/+1167
| | | |
| * | | PropertyAnimation optimization and animation code cleanup.Michael Brasser2009-07-021-30/+15
| | |/ | |/|
| * | Have ColorAnimation select all properties of type QColor by default.Michael Brasser2009-07-012-4/+11
| | | | | | | | | | | | | | | This allows you to write ColorAnimation {} in a transition and all colors that are changing will be handled by default.
| * | ListModel code cleanup.Michael Brasser2009-07-012-46/+52
| | |
| * | Change reversible transition semantics.Michael Brasser2009-07-012-8/+5
| | | | | | | | | | | | | | | The new semantics match those of playing a QAbstractionAnimation backward. (i.e. it is now an exact visual reverse)
| * | Cleanup.Michael Brasser2009-07-012-15/+2
| |/
| * Fix animation crash.Michael Brasser2009-07-011-0/+4
| |
| * StateOperation doesn't need to be instantiated from Qml.Michael Brasser2009-07-011-1/+1
| |
| * Support compile-in-namespace for the declarative module.Michael Brasser2009-06-3013-31/+42
| |
| * CleanupMichael Brasser2009-06-3021-22/+71
| | | | | | | | | | Fix up license headers and private warnings, as well as other general cleanups.