summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc work.Michael Brasser2009-05-019-54/+50
|
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-018-790/+875
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-012-2/+30
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0128-1068/+1302
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | 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.
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0110-198/+176
| |\ \ \ | | | |/ | | |/| | | | | 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-013-94/+51
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | 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-012-80/+38
| |/ /
* | | Format conversion for animation, states and transitions, and transformMichael Brasser2009-05-017-104/+125
|/ / | | | | | | elements.
* | 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-3016-909/+1062
|\ \ | | | | | | | | | 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-308-120/+148
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-3025-304/+361
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxpathview.cpp
| | | * docWarwick Allison2009-04-301-16/+11
| | | |
| | | * Documentation work.Michael Brasser2009-04-306-39/+33
| | | |
| | * | 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-307-13/+66
|/ /
* | Fix crash in QmlDomDocument::load()Aaron Kennedy2009-04-302-3/+19
| |
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-303-89/+137
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-3036-1353/+1657
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | More work on transform elements.Michael Brasser2009-04-303-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-304-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 Allison2009-04-3022-1237/+1411
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-30161-7707/+4013
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Documentation for ListViewMartin Jones2009-04-302-98/+46
| | | | | | | | | | | | | | | | | | | | Convert to new format, use \snippet.
| * | | | Don't delay initial resizeWarwick Allison2009-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | (otherwise "default" widget size happens first)
| * | | | Fix smooth scalingWarwick Allison2009-04-301-1/+3
| | | | |
* | | | | Convert all examples and demos from XML formatAaron Kennedy2009-04-302-2/+2
| | | | |
* | | | | Make custom parsers internal.Aaron Kennedy2009-04-3010-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 Kennedy2009-04-3020-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 crashWarwick Allison2009-04-301-4/+4
| | | | | | | | | | | | | | | | Continues d62bc81491b4b3ef76d626fd56f736427ee1e20c
| * | | Compress sizeChanged signal to give width and height.Warwick Allison2009-04-302-2/+15
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-296-620/+703
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Added first/lastSourceLocations to AST::UiObjectMember and improved the ↵Roberto Raggi2009-04-296-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 Smith2009-04-295-19/+52
| |/ / /
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-29235-8714/+4676
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'source' into kinetic-declarativeuiYann Bodson2009-04-297-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 Bodson2009-04-297-13/+13
| | | | |
| * | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-291-1/+0
| | | | |
* | | | | Prototype custom parsers for non-xml qml languageAaron Kennedy2009-04-3012-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 Kennedy2009-04-295-12/+242
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui