summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move the mouse control of the game from the main file to the blocksAlan Alpert2009-07-235-12/+21
* SameGame should now correctly determine game overAlan Alpert2009-07-231-5/+7
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-2330-330/+89
|\
| * Stricter matching for ParentChangeAction.Michael Brasser2009-07-235-7/+16
| * Fix possible crash in XmlListModel.Michael Brasser2009-07-231-0/+2
| * Fix State when handling.Michael Brasser2009-07-232-4/+3
| * Minor header cleanup.Michael Brasser2009-07-233-2/+2
| * remove the id property in QFxItemLars Knoll2009-07-222-32/+0
| * unify z-value handling in graphics and fx items.Lars Knoll2009-07-2210-36/+27
| * Remove an unused method in QFxItemLars Knoll2009-07-2212-50/+0
| * More cleanups in QFxItemLars Knoll2009-07-224-56/+13
| * First round of cleanups for QFxItemLars Knoll2009-07-227-150/+33
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-2213-143/+196
|\ \ | |/
| * Fix GraphicsObjectContainer.Michael Brasser2009-07-222-0/+2
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-222-2/+11
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-2277-930/+1266
| | |\
| | * | Make setRoleNames() protected and improve docs.Martin Jones2009-07-222-2/+11
| * | | Remove moveToParent property.Michael Brasser2009-07-228-138/+152
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-2198-1103/+1500
| |\ \
| | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-2113-37/+342
| | |\ \
| | * | | Fix repaint errors.Michael Brasser2009-07-211-2/+7
| * | | | Add some (disabled) test code for limiting image size.Warwick Allison2009-07-211-1/+24
* | | | | Move errorsString to QmlBindableComponent because it's for use in scriptAlan Alpert2009-07-214-25/+26
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-212-5/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Doc clarification.Michael Brasser2009-07-201-2/+1
| * | | Fix crash.Michael Brasser2009-07-201-3/+4
* | | | Move the Script interface of QmlComponent to QmlBindableComponentAlan Alpert2009-07-219-31/+290
* | | | Update AnimatedImage item to be more similar to AnimationsAlan Alpert2009-07-205-6/+52
|/ / /
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-2056-860/+825
|\ \ \
| * | | Remove unnecessary methods from QmlBindingAaron Kennedy2009-07-202-14/+3
| * | | Prevent expression evaluation data from overlappingAaron Kennedy2009-07-203-4/+20
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-2049-241/+382
| |\ \ \
| * | | | Rework expression stuff to use a more efficient notify handlerAaron Kennedy2009-07-2014-328/+246
| * | | | Rename QmlBindableValue to QmlBindingAaron Kennedy2009-07-2028-109/+100
| * | | | Simplify binding optimizationAaron Kennedy2009-07-204-423/+116
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-2014-42/+56
| |\ \ \ \
| * | | | | Add some basic QML benchmarksAaron Kennedy2009-07-1717-0/+358
* | | | | | Allow minehunt example to compile again.Alan Alpert2009-07-201-1/+0
| |_|/ / / |/| | | |
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-2011-27/+64
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-2037-185/+250
| |\ \ \ \
| * | | | | Add an inSync property that holds whether the target has "caught up"Martin Jones2009-07-204-11/+47
| * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-201322-25536/+33693
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-159-13/+188
| |\ \ \ \ \
| * | | | | | Remove unnecessary semicolonsMartin Jones2009-07-146-16/+16
| * | | | | | Add Timer to elements referenceMartin Jones2009-07-141-0/+1
* | | | | | | Update Gnome theme to only spin on mouse over, like same-gnomeAlan Alpert2009-07-208-24/+56
* | | | | | | Pause instead of stop when playing == false.Alan Alpert2009-07-201-1/+1
* | | | | | | Fix bug in AnimatedImage where it wouldn't show until playedAlan Alpert2009-07-202-4/+11
| |_|_|/ / / |/| | | | |
* | | | | | Bug fixes for SameGame demoAlan Alpert2009-07-205-3/+0
* | | | | | Use the images from Same Gnome as our second theme.Alan Alpert2009-07-208-12/+42