Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-27 | 2 | -361/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro | ||||
* \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-04-22 | 1 | -46/+76 |
|\ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp | ||||
| * | | Fixes for solution package. | Jan-Arve Sæther | 2009-04-22 | 1 | -46/+76 |
| | | | |||||
* | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 1 | -9/+5 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | | update the package script according to class renaming | Kent Hansen | 2009-04-21 | 1 | -4/+4 |
| | | | |||||
| * | | remove QItemAnimation and add the interpolator for QColor | Thierry Bastian | 2009-04-20 | 1 | -0/+1 |
| | | | |||||
| * | | cleanup in demo | Thierry Bastian | 2009-04-20 | 1 | -1/+0 |
| | | | | | | | | | | | | sub-attaq doesn't use anymore animation private headers | ||||
| * | | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 5 | -0/+1684 |
| / | |||||
* | | Initial import of kinetic-dui branch from the old kinetic | Michael Brasser | 2009-04-22 | 2 | -0/+337 |
|/ | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 4 | -0/+1353 |