summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Remove unused QmlContextPrivate member variablesAaron Kennedy2009-08-044-17/+2
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-045-18/+22
|\
| * Fixed import parsing, where the importId wasn't set.Erik Verbruggen2009-08-032-0/+4
| * Renaming: FocusRealm -> FocusScopeYann Bodson2009-08-033-18/+18
* | Improve performance by separating id and context propertiesAaron Kennedy2009-08-048-91/+78
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-0315-135/+87
|\ \ | |/
| * Move the 'smooth' property to QFxItemYann Bodson2009-08-0314-133/+79
| * Notify of VisualDataModel count changes.Martin Jones2009-08-031-2/+8
* | Shortcut testing for internal QVariant typesAaron Kennedy2009-08-031-0/+2
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-08-0314-315/+336
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-0310-231/+242
| |\
| | * Improve calculator demo and add missing text property to QmlPalette.Yann Bodson2009-08-032-0/+14
| | * 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-035-84/+94
| | |/ | |/|
* | | Rework VisualItemModel into VisualItemModel & VisualDataModelMartin Jones2009-08-0310-170/+377
|/ /
* | 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-0226-128/+180
|\ \
| * | 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
| * | | 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-319-153/+198
|\ \ \ | | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-316-137/+205
| |\ \ | | |/
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-312-5/+25
| | |\
| | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-311604-22931/+47965
| | |\ \
| | * | | tile/preservseAspect are now fillModeWarwick Allison2009-07-313-95/+134
| | * | | 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-3117-77/+101
|\ \ \ \ | |/ / /
| * | | 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-314-18/+3
| |\ \ \ \ | | |/ / /
| * | | | Remove paintContents.Michael Brasser2009-07-3112-65/+59
| * | | | Add baselineOffset to anchors.Michael Brasser2009-07-314-3/+26
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-311598-22877/+47924
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add missing QDebug operator entry for ItemNegativeZStacksBehindParent.Andreas Aardal Hanssen2009-07-311-0/+3
| * | | | Remove unused functionality.Andreas Aardal Hanssen2009-07-313-18/+0
| |/ / /
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-3157-2497/+825
| |\ \ \
| | * | | Docs: Make precedence clear.Michael Brasser2009-07-311-0/+4