summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Don't manually stack children on GraphicsViewAaron Kennedy2009-04-241-5/+1
| | | | GraphicsView now has a sane default stacking order.
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-249-242/+122
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Using QVariant interpolators in qml variant animationLeonardo Sobral Cunha2009-04-231-88/+3
| |
| * qdoc: Edited the documentation to remove numerous qdoc warnings.Martin Smith2009-04-231-7/+7
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-232-4/+4
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fix signal usage from QmlcomponentAlexis Menard2009-04-232-4/+4
| | |
| * | qdoc: Edited the documentation to remove numerous qdoc warnings.Martin Smith2009-04-233-14/+14
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-231-1/+1
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * The signal should emit the namespace as well otherwise a connect willAlexis Menard2009-04-231-1/+1
| | | | | | | | | | | | be not trivial.
| * | qdoc: Edited the documentation to remove numerous qdoc warnings.Martin Smith2009-04-233-128/+93
| |/
* | Don't access internal QMetaProperty membersAaron Kennedy2009-04-241-5/+1
| | | | | | | | We can use the new QMetaProperty::propertyIndex() method instead.
* | Add a Follow::followValue propertyAaron Kennedy2009-04-232-0/+22
| |
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-234-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 notMartin Jones2009-04-231-2/+0
| | | | | | | | laying out.
| * Small doc fix - use a real element in the example.Martin Jones2009-04-231-2/+2
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-232-10/+2
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Component and ComponentInstance documentation.Martin Jones2009-04-232-0/+44
| | |
* | | Split up QmlMetaProperty::write() methodAaron Kennedy2009-04-232-33/+225
| |/ |/|
* | Make declarative autotests compile.Aaron Kennedy2009-04-231-0/+2
| | | | | | | | No guarentees are made as to whether they pass.
* | Remove QMetaObject hierarchy search from QmlMetaType::default*() methodsAaron Kennedy2009-04-231-10/+0
|/ | | | QMetaObject::indexOfClassInfo() already searches the entire hierarchy
* Merge in changes to old kinetic-dui branch.Michael Brasser2009-04-2345-271/+403
|
* Fix sefaults introduced by merge.Michael Brasser2009-04-233-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 Brasser2009-04-223-23/+20
|\ | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp
| * Fixes QPropertyAnimation's default start value update conditionLeonardo Sobral Cunha2009-04-222-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æther2009-04-221-2/+3
| |
* | Make compileMichael Brasser2009-04-223-7/+5
| | | | | | | | I've temporarily commented out the body of qguivariantanimation.cpp so we can compile.
* | Fix merge error.Michael Brasser2009-04-221-4/+30
| |
* | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-2264-2262/+2207
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Expose QVariantAnimationPrivate::getInterpolator in the private headerLeonardo Sobral Cunha2009-04-212-2/+4
| | | | | | | | These interpolator functions might be useful for other internal classes.
| * QPropertyAnimation reevaluates the default start value after each runLeonardo Sobral Cunha2009-04-211-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-statemachineKent Hansen2009-04-211-1/+2
| |\
| | * Fixes bug when adding the same child animation twice to the same groupLeonardo Sobral Cunha2009-04-211-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-statemachineKent Hansen2009-04-2115-600/+117
| |\ \ | | |/
| | * don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| | |
| | * remove QItemAnimation and add the interpolator for QColorThierry Bastian2009-04-206-511/+28
| | |
| | * iterationCount becomes loopCount againThierry Bastian2009-04-209-89/+89
| | |
| * | rename QTransition -> QActionTransitionKent Hansen2009-04-2113-87/+88
| | |
| * | don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| | |
| * | initialize "for-future-expansion"-pointerKent Hansen2009-04-201-1/+1
| |/
| * Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-201-3/+4
| |\
| | * Fix compilation after a merge errorAlexis Menard2009-04-171-3/+4
| | |
| * | docKent Hansen2009-04-2013-6/+25
| | |
| * | more docKent Hansen2009-04-172-2/+6
| | |
| * | docKent Hansen2009-04-174-4/+5
| | |
| * | compileKent Hansen2009-04-171-0/+2
| | |
| * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-17297-5356/+9003
| |\ \ | | |/
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-17297-5356/+9003
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-179574-0/+3638767
| | / | | | | | | | | | repository to the new repository
| * | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-179572-0/+3639162
| /
* | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-2251-735/+863
|\ \