Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-01 | 30 | -985/+1240 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-01 | 15 | -852/+1056 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-01 | 8 | -2/+148 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-01 | 42 | -1203/+1539 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | More examples. | Warwick Allison | 2009-05-01 | 2 | -0/+50 |
| | | | | | |||||
| | | * | | 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. | ||||
| | | * | | Show how to achieve aspect-ratio-maintaining effects. | Warwick Allison | 2009-05-01 | 4 | -0/+68 |
| | | | | | |||||
| | * | | | Remove unnecessary escaping from data | Aaron Kennedy | 2009-05-01 | 1 | -62/+63 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-01 | 18 | -199/+281 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | 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 | 8 | -94/+128 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Format conversion for animation, states and transitions, and transform | Michael Brasser | 2009-05-01 | 9 | -104/+152 |
| | | | | | | | | | | | | | | | | | | | | elements. | ||||
| * | | | | Fix typo. | Michael Brasser | 2009-05-01 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | More format changes | Martin Jones | 2009-05-01 | 5 | -47/+70 |
| | | | | |||||
* | | | | More format conversion. | Martin Jones | 2009-05-01 | 4 | -28/+44 |
| |/ / |/| | | |||||
* | | | 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 | 7 | -80/+115 |
|/ / | |||||
* | | Added simple autotests for QmlDom classes | Kai Koehne | 2009-04-30 | 2 | -0/+93 |
| | | |||||
* | | 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 | 28 | -1267/+1231 |
|\ \ | | | | | | | | | | 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 | 20 | -478/+317 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Join some lines in example code. | Martin Jones | 2009-04-30 | 2 | -132/+36 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-30 | 77 | -1619/+2238 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxpathview.cpp | ||||
| | | * | Support stdin | Warwick Allison | 2009-04-30 | 1 | -12/+14 |
| | | | | |||||
| | | * | doc | Warwick Allison | 2009-04-30 | 1 | -16/+11 |
| | | | | |||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-04-30 | 13 | -232/+111 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | Documentation work. | Michael Brasser | 2009-04-30 | 13 | -232/+111 |
| | | | | | |||||
| | | * | | port syntax | Warwick Allison | 2009-04-30 | 1 | -21/+40 |
| | | | | | |||||
| | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-04-30 | 2 | -3/+19 |
| | | |\ \ | | | | |/ | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | whitespace | Warwick Allison | 2009-04-30 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | 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 | 9 | -15/+69 |
|/ / / | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-30 | 1 | -40/+61 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-04-30 | 36 | -914/+1289 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: demos/declarative/webbrowser/webbrowser.qml | ||||
| * | | | Port syntax | Warwick Allison | 2009-04-30 | 2 | -173/+479 |
| | | | | |||||
* | | | | Fix crash in QmlDomDocument::load() | Aaron Kennedy | 2009-04-30 | 2 | -3/+19 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-30 | 14 | -135/+180 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Rename duiviewer to qmlviewer. | Michael Brasser | 2009-04-30 | 10 | -46/+43 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-04-30 | 176 | -3613/+5882 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | More work on transform elements. | Michael Brasser | 2009-04-30 | 4 | -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 | 33 | -325/+443 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 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 | 31 | -1393/+1739 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-30 | 372 | -11113/+11401 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |