summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused QmlContextPrivate member variablesAaron Kennedy2009-08-044-17/+2
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-08-0413-46/+50
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fixed import parsing, where the importId wasn't set.Erik Verbruggen2009-08-032-0/+4
| | | | | | | | Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * 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 ↵Aaron Kennedy2009-08-0315-135/+87
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Move the 'smooth' property to QFxItemYann Bodson2009-08-0314-133/+79
| | | | | | | | | | Items currently using it are QFxImage, QFxText, QFxLineEdit, QFxTextEdit and QFxPaintedItem.
| * 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 ↵Aaron Kennedy2009-08-0311-170/+434
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-0332-376/+473
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Rework VisualItemModel into VisualItemModel & VisualDataModelMartin Jones2009-08-0311-170/+434
| | | | | | | | | | | | | | | | | | QFXVisualModel provides a base class for visual models. QFxVisualDataModel provides a visual model for Qt item view models. QFxVisualItemModel provides a model of QFxItems.
* | | Add another benchmarkAaron Kennedy2009-08-039-0/+55
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-08-0318-291/+273
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | 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 ↵Warwick Allison2009-08-039-33/+148
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | 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 ↵Martin Jones2009-08-0230-136/+188
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | DocumentationYann Bodson2009-08-016-25/+140
| | |
| * | Add CONSTANTYann Bodson2009-08-011-1/+1
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-3112-80/+18
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-314-15/+14
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Get rid of QFxItem::options.Michael Brasser2009-07-3112-80/+18
| | | | | | | | | | | | | | | | They can all be set directly with QGraphicsItem flags or functions.
| * | | Use new enum ints (should be ids!)Warwick Allison2009-07-314-8/+8
| | | |
| * | | Make QFxScaleGrid privateWarwick Allison2009-07-317-7/+7
| | |/ | |/| | | | | | | As per API review
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-315-21/+18
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Other minor API review changes.Warwick Allison2009-07-314-15/+14
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-3119-157/+243
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-3116-141/+250
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-312-5/+25
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | update for fa75cbdd3e1ae7b7d10d582498ae7e1d535f82ecWarwick Allison2009-07-311-2/+2
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-311846-28440/+53554
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfximage.cpp
| | * | | tile/preservseAspect are now fillModeWarwick Allison2009-07-3112-98/+176
| | | | | | | | | | | | | | | | | | | | as per API review
| | * | | Fix autorecord.Warwick Allison2009-07-311-1/+3
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-316-27/+78
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Centralize image reading.Warwick Allison2009-07-301-37/+46
| | | | | | | | | | | | | | | | | | | | | | | | Also put local files in QPixmapCache.
| * | | | | 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 ↵Martin Jones2009-07-3118-77/+103
|\ \ \ \ | |/ / / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-312-9/+16
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Fix compile breakage in 638fd43 by using QGraphicsItem::focusProxy().Andreas Aardal Hanssen2009-07-311-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turned out this functionality was in used after all, although calling "git grep" didn't reveal its usage. Reviewed-by: Michael Brasser
| | * | | Remove unused include.Andreas Aardal Hanssen2009-07-311-1/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-311-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui