summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0130-985/+1240
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0115-852/+1056
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-018-2/+148
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0142-1203/+1539
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | More examples.Warwick Allison2009-05-012-0/+50
| | | | |
| | | * | Add epsilon to Follow can be used in more circumstances.Warwick Allison2009-05-012-2/+30
| | | | | | | | | | | | | | | | | | | | Was biased to pixel-sized values. Scale-sized values did not work smoothly.
| | | * | Show how to achieve aspect-ratio-maintaining effects.Warwick Allison2009-05-014-0/+68
| | | | |
| | * | | Remove unnecessary escaping from dataAaron Kennedy2009-05-011-62/+63
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0118-199/+281
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Support multiline string literals when assigned directly to a QML propertyAaron Kennedy2009-05-016-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 Brasser2009-05-016-28/+31
| | |/ / | |/| |
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-018-94/+128
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Format conversion for animation, states and transitions, and transformMichael Brasser2009-05-019-104/+152
| | | | | | | | | | | | | | | | | | | | elements.
| * | | | Fix typo.Michael Brasser2009-05-011-1/+1
| | |/ / | |/| |
* | | | More format changesMartin Jones2009-05-015-47/+70
| | | |
* | | | More format conversion.Martin Jones2009-05-014-28/+44
| |/ / |/| |
* | | Fix insertion of items when there are no existing items.Martin Jones2009-05-011-1/+1
| | |
* | | Format conversion.Martin Jones2009-05-011-13/+12
| | |
* | | PathView format conversion.Martin Jones2009-05-017-80/+115
|/ /
* | Added simple autotests for QmlDom classesKai Koehne2009-04-302-0/+93
| |
* | Report the syntax errors.Roberto Raggi2009-04-301-1/+38
| |
* | Removed a fiew compilation warnings on MSVCThierry Bastian2009-04-303-2/+4
| |
* | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-3028-1267/+1231
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Using QVariant for 'to' and 'from' values in QmlVariantAnimationPrivateLeonardo Sobral Cunha2009-04-302-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 QmlColorAnimationLeonardo Sobral Cunha2009-04-302-19/+16
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-3020-478/+317
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Join some lines in example code.Martin Jones2009-04-302-132/+36
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-3077-1619/+2238
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxpathview.cpp
| | | * Support stdinWarwick Allison2009-04-301-12/+14
| | | |
| | | * docWarwick Allison2009-04-301-16/+11
| | | |
| | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-3013-232/+111
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Documentation work.Michael Brasser2009-04-3013-232/+111
| | | | |
| | | * | port syntaxWarwick Allison2009-04-301-21/+40
| | | | |
| | | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-302-3/+19
| | | |\ \ | | | | |/ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | whitespaceWarwick Allison2009-04-301-0/+1
| | | | |
| | * | | Doc.Martin Jones2009-04-301-1/+1
| | | | |
| | * | | Item insertion and removal for PathView.Martin Jones2009-04-302-65/+103
| | | | | | | | | | | | | | | | | | | | Not animated at the moment.
| * | | | Accept "return" and reserved words as property namesAaron Kennedy2009-04-306-750/+880
| | |_|/ | |/| |
* | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-309-15/+69
|/ / /
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-301-40/+61
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-3036-914/+1289
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: demos/declarative/webbrowser/webbrowser.qml
| * | | Port syntaxWarwick Allison2009-04-302-173/+479
| | | |
* | | | Fix crash in QmlDomDocument::load()Aaron Kennedy2009-04-302-3/+19
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-3014-135/+180
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Rename duiviewer to qmlviewer.Michael Brasser2009-04-3010-46/+43
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-30176-3613/+5882
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | More work on transform elements.Michael Brasser2009-04-304-89/+137
| | | | | | | | | | | | | | | | | | | | AxisRotation/AxisTranslation have been renamed Rotation3D/Translation3D. Squish has gained a raster implementation and basic docs.
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-3033-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 Allison2009-04-3031-1393/+1739
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-30372-11113/+11401
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui