Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get qmldebugger running, and add basic object/property view. | Michael Brasser | 2009-08-04 | 3 | -2/+9 |
| | |||||
* | 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. | ||||
* | | | 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 | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-31 | 6 | -137/+205 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | More QFxItem cleanup. | Michael Brasser | 2009-07-31 | 5 | -21/+18 |
| | | | |||||
* | | | Other minor API review changes. | Warwick Allison | 2009-07-31 | 4 | -15/+14 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 2 | -5/+25 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Doc | Martin Jones | 2009-07-31 | 1 | -0/+11 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-31 | 16 | -76/+101 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-31 | 19 | -356/+491 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Some pathview focus fixes. | Martin Jones | 2009-07-31 | 1 | -5/+14 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 24 | -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 Brasser | 2009-07-31 | 1 | -8/+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 paintContents. | Michael Brasser | 2009-07-31 | 12 | -65/+59 |
| | | | | |||||
| * | | | Add baselineOffset to anchors. | Michael Brasser | 2009-07-31 | 4 | -3/+26 |
| |/ / | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-31 | 57 | -2497/+825 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Docs: Make precedence clear. | Michael Brasser | 2009-07-31 | 1 | -0/+4 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-31 | 6 | -27/+78 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Rename Rect.pen to Rect.border | Michael Brasser | 2009-07-31 | 2 | -57/+20 |
| | | | | | |||||
| | * | | | Rename centeredIn to centerIn. | Michael Brasser | 2009-07-31 | 4 | -31/+31 |
| | | | | | |||||
| | * | | | More QFxItem cleanup. | Michael Brasser | 2009-07-31 | 4 | -29/+13 |
| | | | | | |||||
| | * | | | Introduce Loader item. | Michael Brasser | 2009-07-30 | 7 | -164/+359 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The Loader item takes the qml/qmlItem functionality from Item and moves it to a specialized subclass. | ||||
| | * | | | More QFxItem cleanup. | Michael Brasser | 2009-07-30 | 3 | -46/+0 |
| | | | | | |||||
| * | | | | Revert "qdoc: Corrected some qdoc warnings." | Aaron Kennedy | 2009-07-30 | 1 | -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 fillMode | Warwick Allison | 2009-07-31 | 3 | -95/+134 |
| | | | | | | | | | | | | | | | | | | | | as per API review | ||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-31 | 6 | -27/+78 |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-07-31 | 1 | -0/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Fixed AST visiting, so UiProgram *members* are visited again. | Erik Verbruggen | 2009-07-30 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | QmlFontFamily improvements | Yann Bodson | 2009-07-31 | 2 | -11/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'status' property instead of 'loading'. Improve documentaion. | ||||
| * | | | | Docs | Yann Bodson | 2009-07-31 | 2 | -14/+30 |
| |/ / / | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-30 | 5 | -21/+21 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Don't bounce around when removing the current item. | Martin Jones | 2009-07-30 | 1 | -2/+15 |
| | | | | |||||
* | | | | Centralize image reading. | Warwick Allison | 2009-07-30 | 1 | -37/+46 |
| |/ / |/| | | | | | | | | Also put local files in QPixmapCache. | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-30 | 1 | -7/+9 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-30 | 17 | -123/+62 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | maxYExtent() should never be greater than minYExtent() | Martin Jones | 2009-07-30 | 1 | -7/+9 |
| | | | | |||||
* | | | | More QFxItem cleanup. | Michael Brasser | 2009-07-30 | 5 | -21/+21 |
| |/ / |/| | | |||||
* | | | Move paint margin functionality to QFxRect. | Michael Brasser | 2009-07-30 | 6 | -21/+24 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-30 | 6 | -1838/+147 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Removed unused code. | Martin Jones | 2009-07-30 | 1 | -13/+0 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-30 | 5 | -1821/+143 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Removed the (outdated) pretty printer for the JS expressions. | Roberto Raggi | 2009-07-30 | 3 | -1666/+1 |
| | | | | |||||
| | * | | Improved the support for post-visits of the AST. | Roberto Raggi | 2009-07-30 | 2 | -155/+142 |
| | | | | |||||
| * | | | Don't disconnect item size connections if the item is referenced. | Martin Jones | 2009-07-30 | 1 | -4/+4 |
| |/ / |