summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-08-044-4/+133
|\
| * Do not use antialiasing with gradient rounded rect if smooth = falseYann Bodson2009-08-041-2/+4
| * Example of smooth rect paintingYann Bodson2009-08-043-0/+110
| * Paint Rect smoothlyYann Bodson2009-08-041-2/+19
* | Fix imports.Warwick Allison2009-08-04104-52/+209
* | Fix to use "." not "/" in QML_DEFINE_TYPE URIsWarwick Allison2009-08-044-12/+16
|/
* Fixed import parsing, where the importId wasn't set.Erik Verbruggen2009-08-032-0/+4
* Renaming: FocusRealm -> FocusScopeYann Bodson2009-08-0311-46/+46
* Move the 'smooth' property to QFxItemYann Bodson2009-08-0314-133/+79
* Notify of VisualDataModel count changes.Martin Jones2009-08-031-2/+8
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-0311-170/+434
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-08-0332-376/+473
| |\
| * | Rework VisualItemModel into VisualItemModel & VisualDataModelMartin Jones2009-08-0311-170/+434
* | | Add another benchmarkAaron Kennedy2009-08-039-0/+55
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-0318-291/+273
|\ \
| * | Fix Flickr rotationYann Bodson2009-08-031-5/+6
| * | Improve calculator demo and add missing text property to QmlPalette.Yann Bodson2009-08-039-55/+39
| * | Use QPalette::ColorGroup directly.Yann Bodson2009-08-032-18/+10
| * | Remove some warningsYann Bodson2009-08-037-212/+217
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-08-039-33/+148
| |\ \ | | |/
| * | docWarwick Allison2009-07-311-1/+1
* | | Make QmlMetaProperty reentrantAaron Kennedy2009-08-0315-85/+200
| |/ |/|
* | Items marked for removal should be excluded from section updates.Martin Jones2009-08-021-3/+7
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-08-0230-136/+188
|\ \
| * | DocumentationYann Bodson2009-08-016-25/+140
| * | Add CONSTANTYann Bodson2009-08-011-1/+1
| |/
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-3112-80/+18
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-314-15/+14
| | |\
| | * | Get rid of QFxItem::options.Michael Brasser2009-07-3112-80/+18
| * | | Use new enum ints (should be ids!)Warwick Allison2009-07-314-8/+8
| * | | Make QFxScaleGrid privateWarwick Allison2009-07-317-7/+7
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-315-21/+18
| |\ \ | | |/
| * | Other minor API review changes.Warwick Allison2009-07-314-15/+14
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-3119-157/+243
|\ \ \ | | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-3116-141/+250
| |\ \ | | |/
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-312-5/+25
| | |\
| | * | update for fa75cbdd3e1ae7b7d10d582498ae7e1d535f82ecWarwick Allison2009-07-311-2/+2
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-311846-28440/+53554
| | |\ \
| | * | | tile/preservseAspect are now fillModeWarwick Allison2009-07-3112-98/+176
| | * | | Fix autorecord.Warwick Allison2009-07-311-1/+3
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-316-27/+78
| | |\ \ \
| | * | | | Centralize image reading.Warwick Allison2009-07-301-37/+46
| * | | | | More QFxItem cleanup.Michael Brasser2009-07-315-21/+18
| | |_|/ / | |/| | |
* | | | | GV propagates key events for us.Martin Jones2009-07-311-4/+0
| |_|_|/ |/| | |
* | | | DocMartin Jones2009-07-311-0/+11
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-3118-77/+103
|\ \ \ \ | |/ / /
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-312-9/+16
| |\ \ \
| | * | | Fix compile breakage in 638fd43 by using QGraphicsItem::focusProxy().Andreas Aardal Hanssen2009-07-311-8/+16
| | * | | Remove unused include.Andreas Aardal Hanssen2009-07-311-1/+0
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-311-0/+0
| |\ \ \ \ | | |/ / /