Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't manually stack children on GraphicsView | Aaron Kennedy | 2009-04-24 | 1 | -5/+1 |
| | | | | GraphicsView now has a sane default stacking order. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-24 | 9 | -242/+122 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Using QVariant interpolators in qml variant animation | Leonardo Sobral Cunha | 2009-04-23 | 1 | -88/+3 |
| | | |||||
| * | qdoc: Edited the documentation to remove numerous qdoc warnings. | Martin Smith | 2009-04-23 | 1 | -7/+7 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-23 | 2 | -4/+4 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Fix signal usage from Qmlcomponent | Alexis Menard | 2009-04-23 | 2 | -4/+4 |
| | | | |||||
| * | | qdoc: Edited the documentation to remove numerous qdoc warnings. | Martin Smith | 2009-04-23 | 3 | -14/+14 |
| |/ | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-23 | 1 | -1/+1 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | The signal should emit the namespace as well otherwise a connect will | Alexis Menard | 2009-04-23 | 1 | -1/+1 |
| | | | | | | | | | | | | be not trivial. | ||||
| * | | qdoc: Edited the documentation to remove numerous qdoc warnings. | Martin Smith | 2009-04-23 | 3 | -128/+93 |
| |/ | |||||
* | | Don't access internal QMetaProperty members | Aaron Kennedy | 2009-04-24 | 1 | -5/+1 |
| | | | | | | | | We can use the new QMetaProperty::propertyIndex() method instead. | ||||
* | | Add a Follow::followValue property | Aaron Kennedy | 2009-04-23 | 2 | -0/+22 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-23 | 4 | -4/+46 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Layouts: don't mess with the coordinate in the direction we are not | Martin Jones | 2009-04-23 | 1 | -2/+0 |
| | | | | | | | | laying out. | ||||
| * | Small doc fix - use a real element in the example. | Martin Jones | 2009-04-23 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-23 | 2 | -10/+2 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Component and ComponentInstance documentation. | Martin Jones | 2009-04-23 | 2 | -0/+44 |
| | | | |||||
* | | | Split up QmlMetaProperty::write() method | Aaron Kennedy | 2009-04-23 | 2 | -33/+225 |
| |/ |/| | |||||
* | | Make declarative autotests compile. | Aaron Kennedy | 2009-04-23 | 1 | -0/+2 |
| | | | | | | | | No guarentees are made as to whether they pass. | ||||
* | | Remove QMetaObject hierarchy search from QmlMetaType::default*() methods | Aaron Kennedy | 2009-04-23 | 1 | -10/+0 |
|/ | | | | QMetaObject::indexOfClassInfo() already searches the entire hierarchy | ||||
* | Merge in changes to old kinetic-dui branch. | Michael Brasser | 2009-04-23 | 45 | -271/+403 |
| | |||||
* | Fix sefaults introduced by merge. | Michael Brasser | 2009-04-23 | 3 | -83/+76 |
| | | | | | For now, use kinetic-animations' version of the qvariant changes, as the ones in master cause segfaults. | ||||
* | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-04-22 | 3 | -23/+20 |
|\ | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp | ||||
| * | Fixes QPropertyAnimation's default start value update condition | Leonardo Sobral Cunha | 2009-04-22 | 2 | -20/+16 |
| | | | | | | | | | | | | | | The default start value is updated when the animation changes from Stopped to Running state. Reviewed-by: Jan-Arve | ||||
| * | Fixes for solution package. | Jan-Arve Sæther | 2009-04-22 | 1 | -2/+3 |
| | | |||||
* | | Make compile | Michael Brasser | 2009-04-22 | 3 | -7/+5 |
| | | | | | | | | I've temporarily commented out the body of qguivariantanimation.cpp so we can compile. | ||||
* | | Fix merge error. | Michael Brasser | 2009-04-22 | 1 | -4/+30 |
| | | |||||
* | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 64 | -2262/+2207 |
|\ \ | |/ | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | Expose QVariantAnimationPrivate::getInterpolator in the private header | Leonardo Sobral Cunha | 2009-04-21 | 2 | -2/+4 |
| | | | | | | | | These interpolator functions might be useful for other internal classes. | ||||
| * | QPropertyAnimation reevaluates the default start value after each run | Leonardo Sobral Cunha | 2009-04-21 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | When the start value is not explicitly defined, the property animation will set the default start to be the current property value when updating the animation's state to Running. Reviewed-by: Jan-Arve | ||||
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| |\ | |||||
| | * | Fixes bug when adding the same child animation twice to the same group | Leonardo Sobral Cunha | 2009-04-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The child animation was removed twice from the group because in QAnimationGroup::insertAnimationAt the insertion in the list was done before removing the animation. Reviewed-by: Jan-Arve | ||||
| * | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-21 | 15 | -600/+117 |
| |\ \ | | |/ | |||||
| | * | don't assert if the signal is not valid | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| | | | |||||
| | * | remove QItemAnimation and add the interpolator for QColor | Thierry Bastian | 2009-04-20 | 6 | -511/+28 |
| | | | |||||
| | * | iterationCount becomes loopCount again | Thierry Bastian | 2009-04-20 | 9 | -89/+89 |
| | | | |||||
| * | | rename QTransition -> QActionTransition | Kent Hansen | 2009-04-21 | 13 | -87/+88 |
| | | | |||||
| * | | don't assert if the signal is not valid | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| | | | |||||
| * | | initialize "for-future-expansion"-pointer | Kent Hansen | 2009-04-20 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-20 | 1 | -3/+4 |
| |\ | |||||
| | * | Fix compilation after a merge error | Alexis Menard | 2009-04-17 | 1 | -3/+4 |
| | | | |||||
| * | | doc | Kent Hansen | 2009-04-20 | 13 | -6/+25 |
| | | | |||||
| * | | more doc | Kent Hansen | 2009-04-17 | 2 | -2/+6 |
| | | | |||||
| * | | doc | Kent Hansen | 2009-04-17 | 4 | -4/+5 |
| | | | |||||
| * | | compile | Kent Hansen | 2009-04-17 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-17 | 297 | -5356/+9003 |
| |\ \ | | |/ | |||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-04-17 | 297 | -5356/+9003 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | * | | Initial import of kinetic-animations branch from the old kinetic | Alexis Menard | 2009-04-17 | 9574 | -0/+3638767 |
| | / | | | | | | | | | | repository to the new repository | ||||
| * | | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 9572 | -0/+3639162 |
| / | |||||
* | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 51 | -735/+863 |
|\ \ |