summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY.Roberto Raggi2009-05-044-628/+582
|
* Correctly set the JsIdentifier svalAaron Kennedy2009-05-012-4/+14
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-013-120/+174
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-014-36/+31
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | docWarwick Allison2009-05-013-120/+174
| | |
* | | Add QML signal declaration syntaxAaron Kennedy2009-05-018-824/+851
| |/ |/| | | | | | | | | | | | | Syntax is signal <signalName> Currently signal parameters aren't supported
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0112-360/+517
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * docWarwick Allison2009-05-016-109/+136
| |
| * docWarwick Allison2009-05-016-251/+381
| |
* | Rename QFxView::setXml to QFxView::setQml.Michael Brasser2009-05-013-33/+28
| |
* | Correct doc.Michael Brasser2009-05-011-3/+3
|/
* docWarwick Allison2009-05-018-74/+92
|
* docWarwick Allison2009-05-017-57/+68
|
* docWarwick Allison2009-05-011-18/+39
|
* Remove userStyleSheetUrl.Warwick Allison2009-05-011-15/+23
| | | | | Doc Only supports localfiles, not resolved against document URL if relative.
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0118-995/+1150
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-019-54/+50
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-019-87/+98
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Doc work.Michael Brasser2009-05-019-54/+50
| | | |
| * | | CompileAaron Kennedy2009-05-011-1/+1
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0114-115/+129
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Tweak QML property syntaxAaron Kennedy2009-05-018-940/+1099
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The syntax is now [default] property <type> <name> [ : <expression> ] where name is one of "int", "bool", "double", "real", "string", "color", "date", "var" or "variant"
* | | | Ensure baseUrl is set.Warwick Allison2009-05-011-7/+7
| |/ / |/| | | | | | | | | | | userStyleSheet is still useless though - it's never resolved, and it can only be a localfile.
* | | Small fix for QXmlListModel.Yann Bodson2009-05-011-1/+1
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-017-86/+77
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | More format changes.Martin Jones2009-05-012-11/+14
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0120-922/+1031
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | More format changesMartin Jones2009-05-013-47/+31
| | | |
| * | | More format conversion.Martin Jones2009-05-012-28/+32
| | | |
* | | | Support userStyleSheetUrl.Warwick Allison2009-05-011-0/+20
| |/ / |/| |
* | | 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
| | | |