Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-01 | 8 | -790/+875 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-01 | 2 | -2/+30 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-01 | 26 | -1066/+1300 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Add epsilon to Follow can be used in more circumstances. | Warwick Allison | 2009-05-01 | 2 | -2/+30 |
| | | | | | | | | | | | | | | | | Was biased to pixel-sized values. Scale-sized values did not work smoothly. | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-01 | 10 | -198/+176 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Support multiline string literals when assigned directly to a QML property | Aaron Kennedy | 2009-05-01 | 6 | -788/+845 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, this is now allowed: Text { text: "Hello World" } but this isn't as bindings are "real" javascript: Text { text: "Big " + "Hello World" } | ||||
* | | | | More format conversion. | Michael Brasser | 2009-05-01 | 6 | -28/+31 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-01 | 3 | -94/+51 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Fix insertion of items when there are no existing items. | Martin Jones | 2009-05-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Format conversion. | Martin Jones | 2009-05-01 | 1 | -13/+12 |
| | | | | |||||
| * | | | PathView format conversion. | Martin Jones | 2009-05-01 | 2 | -80/+38 |
| |/ / | |||||
* | | | Format conversion for animation, states and transitions, and transform | Michael Brasser | 2009-05-01 | 7 | -104/+125 |
|/ / | | | | | | | elements. | ||||
* | | Report the syntax errors. | Roberto Raggi | 2009-04-30 | 1 | -1/+38 |
| | | |||||
* | | Removed a fiew compilation warnings on MSVC | Thierry Bastian | 2009-04-30 | 3 | -2/+4 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-30 | 16 | -909/+1062 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Using QVariant for 'to' and 'from' values in QmlVariantAnimationPrivate | Leonardo Sobral Cunha | 2009-04-30 | 2 | -20/+18 |
| | | | | | | | | | | | | | | | | | | The 'to' and 'from' attiributes in QmlVariantAnimationPrivate were QmlNullableValue before, but we can query QVariant::isValid for the same purpose. | ||||
| * | | Using qvariant color interpolator for QmlColorAnimation | Leonardo Sobral Cunha | 2009-04-30 | 2 | -19/+16 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-30 | 8 | -120/+148 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-30 | 25 | -304/+361 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxpathview.cpp | ||||
| | | * | doc | Warwick Allison | 2009-04-30 | 1 | -16/+11 |
| | | | | |||||
| | | * | Documentation work. | Michael Brasser | 2009-04-30 | 6 | -39/+33 |
| | | | | |||||
| | * | | Doc. | Martin Jones | 2009-04-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | Item insertion and removal for PathView. | Martin Jones | 2009-04-30 | 2 | -65/+103 |
| | | | | | | | | | | | | | | | | Not animated at the moment. | ||||
| * | | | Accept "return" and reserved words as property names | Aaron Kennedy | 2009-04-30 | 6 | -750/+880 |
| | |/ | |/| | |||||
* | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-30 | 5 | -11/+64 |
|/ / | |||||
* | | Fix crash in QmlDomDocument::load() | Aaron Kennedy | 2009-04-30 | 2 | -3/+19 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-30 | 3 | -89/+137 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-04-30 | 36 | -1353/+1657 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | More work on transform elements. | Michael Brasser | 2009-04-30 | 3 | -89/+137 |
| | | | | | | | | | | | | | | | | | | | | AxisRotation/AxisTranslation have been renamed Rotation3D/Translation3D. Squish has gained a raster implementation and basic docs. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-30 | 4 | -100/+50 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/follow/pong.qml examples/declarative/listview/dummydata/MyPetsModel.qml | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-04-30 | 22 | -1237/+1411 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-30 | 38 | -1265/+1849 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Documentation for ListView | Martin Jones | 2009-04-30 | 2 | -98/+46 |
| | | | | | | | | | | | | | | | | | | | | Convert to new format, use \snippet. | ||||
| * | | | | Don't delay initial resize | Warwick Allison | 2009-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | (otherwise "default" widget size happens first) | ||||
| * | | | | Fix smooth scaling | Warwick Allison | 2009-04-30 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Convert all examples and demos from XML format | Aaron Kennedy | 2009-04-30 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Make custom parsers internal. | Aaron Kennedy | 2009-04-30 | 10 | -154/+155 |
| |_|/ / |/| | | | | | | | | | | | Custom parsers still have a way to go before they fully fit the QML 2.0 language. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-30 | 20 | -726/+757 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/parser/javascriptgrammar.cpp src/declarative/qml/parser/javascriptgrammar_p.h | ||||
| * | | | Fix crash | Warwick Allison | 2009-04-30 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Continues d62bc81491b4b3ef76d626fd56f736427ee1e20c | ||||
| * | | | Compress sizeChanged signal to give width and height. | Warwick Allison | 2009-04-30 | 2 | -2/+15 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-29 | 6 | -620/+703 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Added first/lastSourceLocations to AST::UiObjectMember and improved the ↵ | Roberto Raggi | 2009-04-29 | 6 | -620/+703 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generation of `fake' tokens. A `fake' token is a token generated while recovering from a syntax error. | ||||
| * | | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-29 | 5 | -19/+52 |
| |/ / / | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-29 | 111 | -2219/+2459 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'source' into kinetic-declarativeui | Yann Bodson | 2009-04-29 | 7 | -13/+13 |
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/mediabrowser/content/PhonesPathView.qml demos/declarative/mediabrowser/mediabrowser.qml | ||||
| | | * | | Rename the 'src' attribute 'source'. Don't need to be HTML-like anymore. | Yann Bodson | 2009-04-29 | 7 | -13/+13 |
| | | |/ | |||||
| * | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-29 | 1 | -1/+0 |
| | | | | |||||
* | | | | Prototype custom parsers for non-xml qml language | Aaron Kennedy | 2009-04-30 | 12 | -301/+559 |
| | | | | | | | | | | | | | | | | ListModel has been ported (under the name ListModel2) to demonstrate. ListModel2 behaves the same as ListModel, except that list "objects" must be called "ListElement" instead of a freeform name. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-29 | 5 | -12/+242 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | API improvements for Flipable. | Michael Brasser | 2009-04-29 | 3 | -8/+160 |
| | | | | | | | | | | | | | | | | | | | | | | | | You can now specify an axis and rotation, rather than using transform. The tranform behavior has been preserved, however, to allow for cases where you want a more complex transform when rotating. |