summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Get qmldebugger running, and add basic object/property view.Michael Brasser2009-08-043-2/+9
|
* 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.
* | | 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
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-316-137/+205
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | More QFxItem cleanup.Michael Brasser2009-07-315-21/+18
| | |
* | | Other minor API review changes.Warwick Allison2009-07-314-15/+14
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-312-5/+25
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | DocMartin Jones2009-07-311-0/+11
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-3116-76/+101
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-3119-356/+491
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Some pathview focus fixes.Martin Jones2009-07-311-5/+14
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-3124-409/+532
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfximage.cpp
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-311-8/+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 paintContents.Michael Brasser2009-07-3112-65/+59
| | | |
| * | | Add baselineOffset to anchors.Michael Brasser2009-07-314-3/+26
| |/ /
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-3157-2497/+825
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Docs: Make precedence clear.Michael Brasser2009-07-311-0/+4
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-316-27/+78
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Rename Rect.pen to Rect.borderMichael Brasser2009-07-312-57/+20
| | | | |
| | * | | Rename centeredIn to centerIn.Michael Brasser2009-07-314-31/+31
| | | | |
| | * | | More QFxItem cleanup.Michael Brasser2009-07-314-29/+13
| | | | |
| | * | | Introduce Loader item.Michael Brasser2009-07-307-164/+359
| | | | | | | | | | | | | | | | | | | | | | | | | The Loader item takes the qml/qmlItem functionality from Item and moves it to a specialized subclass.
| | * | | More QFxItem cleanup.Michael Brasser2009-07-303-46/+0
| | | | |
| * | | | Revert "qdoc: Corrected some qdoc warnings."Aaron Kennedy2009-07-301-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6df2e157391dd812ee8b71c2373411f2580117d1. Conflicts: src/corelib/animation/qabstractanimation.cpp src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/declarative/qml/qmlcontext.cpp
* | | | | tile/preservseAspect are now fillModeWarwick Allison2009-07-313-95/+134
| | | | | | | | | | | | | | | | | | | | as per API review
* | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-316-27/+78
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-311-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Fixed AST visiting, so UiProgram *members* are visited again.Erik Verbruggen2009-07-301-0/+1
| | | | |
| * | | | QmlFontFamily improvementsYann Bodson2009-07-312-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Add a 'status' property instead of 'loading'. Improve documentaion.
| * | | | DocsYann Bodson2009-07-312-14/+30
| |/ / /
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-305-21/+21
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Don't bounce around when removing the current item.Martin Jones2009-07-301-2/+15
| | | |
* | | | Centralize image reading.Warwick Allison2009-07-301-37/+46
| |/ / |/| | | | | | | | Also put local files in QPixmapCache.
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-301-7/+9
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-3017-123/+62
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | maxYExtent() should never be greater than minYExtent()Martin Jones2009-07-301-7/+9
| | | |
* | | | More QFxItem cleanup.Michael Brasser2009-07-305-21/+21
| |/ / |/| |
* | | Move paint margin functionality to QFxRect.Michael Brasser2009-07-306-21/+24
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-306-1838/+147
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Removed unused code.Martin Jones2009-07-301-13/+0
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-305-1821/+143
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Removed the (outdated) pretty printer for the JS expressions.Roberto Raggi2009-07-303-1666/+1
| | | |
| | * | Improved the support for post-visits of the AST.Roberto Raggi2009-07-302-155/+142
| | | |
| * | | Don't disconnect item size connections if the item is referenced.Martin Jones2009-07-301-4/+4
| |/ /