Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unused QmlContextPrivate member variables | Aaron Kennedy | 2009-08-04 | 4 | -17/+2 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-08-04 | 13 | -46/+50 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fixed import parsing, where the importId wasn't set. | Erik Verbruggen | 2009-08-03 | 2 | -0/+4 |
| | | | | | | | | Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> | ||||
| * | Renaming: FocusRealm -> FocusScope | Yann Bodson | 2009-08-03 | 11 | -46/+46 |
| | | |||||
* | | Improve performance by separating id and context properties | Aaron Kennedy | 2009-08-04 | 11 | -96/+88 |
| | | |||||
* | | Update test | Aaron Kennedy | 2009-08-04 | 12 | -5/+29 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-08-03 | 15 | -135/+87 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Move the 'smooth' property to QFxItem | Yann Bodson | 2009-08-03 | 14 | -133/+79 |
| | | | | | | | | | | Items currently using it are QFxImage, QFxText, QFxLineEdit, QFxTextEdit and QFxPaintedItem. | ||||
| * | Notify of VisualDataModel count changes. | Martin Jones | 2009-08-03 | 1 | -2/+8 |
| | | |||||
* | | Shortcut testing for internal QVariant types | Aaron Kennedy | 2009-08-03 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-08-03 | 11 | -170/+434 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-03 | 32 | -376/+473 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Rework VisualItemModel into VisualItemModel & VisualDataModel | Martin Jones | 2009-08-03 | 11 | -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 benchmark | Aaron Kennedy | 2009-08-03 | 9 | -0/+55 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-08-03 | 18 | -291/+273 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Fix Flickr rotation | Yann Bodson | 2009-08-03 | 1 | -5/+6 |
| | | | |||||
| * | | Improve calculator demo and add missing text property to QmlPalette. | Yann Bodson | 2009-08-03 | 9 | -55/+39 |
| | | | |||||
| * | | Use QPalette::ColorGroup directly. | Yann Bodson | 2009-08-03 | 2 | -18/+10 |
| | | | |||||
| * | | Remove some warnings | Yann Bodson | 2009-08-03 | 7 | -212/+217 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-03 | 9 | -33/+148 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | doc | Warwick Allison | 2009-07-31 | 1 | -1/+1 |
| | | | |||||
* | | | Make QmlMetaProperty reentrant | Aaron Kennedy | 2009-08-03 | 15 | -85/+200 |
| |/ |/| | |||||
* | | Items marked for removal should be excluded from section updates. | Martin Jones | 2009-08-02 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-02 | 30 | -136/+188 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Documentation | Yann Bodson | 2009-08-01 | 6 | -25/+140 |
| | | | |||||
| * | | Add CONSTANT | Yann Bodson | 2009-08-01 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 12 | -80/+18 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-31 | 4 | -15/+14 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Get rid of QFxItem::options. | Michael Brasser | 2009-07-31 | 12 | -80/+18 |
| | | | | | | | | | | | | | | | | They can all be set directly with QGraphicsItem flags or functions. | ||||
| * | | | Use new enum ints (should be ids!) | Warwick Allison | 2009-07-31 | 4 | -8/+8 |
| | | | | |||||
| * | | | Make QFxScaleGrid private | Warwick Allison | 2009-07-31 | 7 | -7/+7 |
| | |/ | |/| | | | | | | | As per API review | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 5 | -21/+18 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Other minor API review changes. | Warwick Allison | 2009-07-31 | 4 | -15/+14 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-31 | 19 | -157/+243 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-31 | 16 | -141/+250 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 2 | -5/+25 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | update for fa75cbdd3e1ae7b7d10d582498ae7e1d535f82ec | Warwick Allison | 2009-07-31 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 1846 | -28440/+53554 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfximage.cpp | ||||
| | * | | | tile/preservseAspect are now fillMode | Warwick Allison | 2009-07-31 | 12 | -98/+176 |
| | | | | | | | | | | | | | | | | | | | | as per API review | ||||
| | * | | | Fix autorecord. | Warwick Allison | 2009-07-31 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 6 | -27/+78 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Centralize image reading. | Warwick Allison | 2009-07-30 | 1 | -37/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also put local files in QPixmapCache. | ||||
| * | | | | | More QFxItem cleanup. | Michael Brasser | 2009-07-31 | 5 | -21/+18 |
| | |_|/ / | |/| | | | |||||
* | | | | | GV propagates key events for us. | Martin Jones | 2009-07-31 | 1 | -4/+0 |
| |_|_|/ |/| | | | |||||
* | | | | Doc | Martin Jones | 2009-07-31 | 1 | -0/+11 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-31 | 18 | -77/+103 |
|\ \ \ \ | |/ / / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-31 | 2 | -9/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Fix compile breakage in 638fd43 by using QGraphicsItem::focusProxy(). | Andreas Aardal Hanssen | 2009-07-31 | 1 | -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 Hanssen | 2009-07-31 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-31 | 1 | -0/+0 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |