summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make QFxAnchorLine private and internalAaron Kennedy2009-08-058-27/+40
* Fixup QPoint and QRect value typesAaron Kennedy2009-08-052-18/+161
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-0516-356/+142
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-04119-371/+318
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-08-04189-801/+1463
| | |\
| | * | Get qmldebugger running, and add basic object/property view.Michael Brasser2009-08-0411-307/+93
| * | | Renaming: FontFamily -> FontLoaderYann Bodson2009-08-044-47/+47
| * | | Move QmlFontFamily to extra.Yann Bodson2009-08-044-4/+4
* | | | Fix testAaron Kennedy2009-08-052-3/+3
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-04112-68/+358
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| |/ /
* | | 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-0413-46/+50
|\ \ \ | |/ /
| * | Fixed import parsing, where the importId wasn't set.Erik Verbruggen2009-08-032-0/+4
| * | Renaming: FocusRealm -> FocusScopeYann Bodson2009-08-0311-46/+46
* | | Improve performance by separating id and context propertiesAaron Kennedy2009-08-0411-96/+88
* | | Update testAaron Kennedy2009-08-0412-5/+29
* | | 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...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
|\ \ \ | | |/ | |/|