summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix QmlDom breakageKai Koehne2009-05-041-8/+2
| | | | | | | | | Two actual copies of QmlScriptParser & the parse tree were instantiated in QmlDocument::load, with the result that the additions that the compiler stored in the one parse tree were not seen by the Dom classes, using the other one. Reviewed-by: erikv
* Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-044-628/+582
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY.Roberto Raggi2009-05-044-628/+582
| |
* | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-042-4/+6
|/
* Use QML signal syntaxAaron Kennedy2009-05-014-11/+4
|
* Use QML properties syntaxAaron Kennedy2009-05-0123-130/+68
|
* 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-0110-70/+79
| |\ | | | | | | | | | 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-016-42/+37
| |
* | Correct doc.Michael Brasser2009-05-011-3/+3
| |
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0125-1111/+1328
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * 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-0134-1203/+1529
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0125-262/+429
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | CompileAaron Kennedy2009-05-011-1/+1
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0118-115/+180
| | |\ \ | | | | | | | | | | | | | | | 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.
* | | | Doc work.Michael Brasser2009-05-013-25/+39
| |_|/ |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0113-87/+149
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Small fix for QXmlListModel.Yann Bodson2009-05-011-1/+1
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0111-86/+128
| |\ \ | | | | | | | | | | | | 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-0130-985/+1240
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | More format changesMartin Jones2009-05-015-47/+70
| | | | |
| | * | | More format conversion.Martin Jones2009-05-014-28/+44
| | | | |
| * | | | Support userStyleSheetUrl.Warwick Allison2009-05-011-0/+20
| | |/ / | |/| |
* | | | Doc work.Michael Brasser2009-05-0125-262/+429
|/ / /
* | | 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
| * | | Fix insertion of items when there are no existing items.Martin Jones2009-05-011-1/+1
| | | |
| * | | Format conversion.Martin Jones2009-05-011-13/+12
| | | |