Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix QmlDom breakage | Kai Koehne | 2009-05-04 | 1 | -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 Smith | 2009-05-04 | 4 | -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 Raggi | 2009-05-04 | 4 | -628/+582 |
| | | |||||
* | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-05-04 | 2 | -4/+6 |
|/ | |||||
* | Use QML signal syntax | Aaron Kennedy | 2009-05-01 | 4 | -11/+4 |
| | |||||
* | Use QML properties syntax | Aaron Kennedy | 2009-05-01 | 23 | -130/+68 |
| | |||||
* | Correctly set the JsIdentifier sval | Aaron Kennedy | 2009-05-01 | 2 | -4/+14 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-01 | 3 | -120/+174 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-01 | 10 | -70/+79 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | doc | Warwick Allison | 2009-05-01 | 3 | -120/+174 |
| | | | |||||
* | | | Add QML signal declaration syntax | Aaron Kennedy | 2009-05-01 | 8 | -824/+851 |
| |/ |/| | | | | | | | | | | | | | Syntax is signal <signalName> Currently signal parameters aren't supported | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-01 | 12 | -360/+517 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | doc | Warwick Allison | 2009-05-01 | 6 | -109/+136 |
| | | |||||
| * | doc | Warwick Allison | 2009-05-01 | 6 | -251/+381 |
| | | |||||
* | | Rename QFxView::setXml to QFxView::setQml. | Michael Brasser | 2009-05-01 | 6 | -42/+37 |
| | | |||||
* | | Correct doc. | Michael Brasser | 2009-05-01 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-01 | 25 | -1111/+1328 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | doc | Warwick Allison | 2009-05-01 | 8 | -74/+92 |
| | | |||||
| * | doc | Warwick Allison | 2009-05-01 | 7 | -57/+68 |
| | | |||||
| * | doc | Warwick Allison | 2009-05-01 | 1 | -18/+39 |
| | | |||||
| * | Remove userStyleSheetUrl. | Warwick Allison | 2009-05-01 | 1 | -15/+23 |
| | | | | | | | | | | Doc Only supports localfiles, not resolved against document URL if relative. | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-01 | 34 | -1203/+1529 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-01 | 25 | -262/+429 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Compile | Aaron Kennedy | 2009-05-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-01 | 18 | -115/+180 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Tweak QML property syntax | Aaron Kennedy | 2009-05-01 | 8 | -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 Allison | 2009-05-01 | 1 | -7/+7 |
| | |/ / | |/| | | | | | | | | | | | | | | userStyleSheet is still useless though - it's never resolved, and it can only be a localfile. | ||||
* | | | | Doc work. | Michael Brasser | 2009-05-01 | 3 | -25/+39 |
| |_|/ |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-01 | 13 | -87/+149 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Small fix for QXmlListModel. | Yann Bodson | 2009-05-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-01 | 11 | -86/+128 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | More format changes. | Martin Jones | 2009-05-01 | 2 | -11/+14 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-01 | 30 | -985/+1240 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | More format changes | Martin Jones | 2009-05-01 | 5 | -47/+70 |
| | | | | | |||||
| | * | | | More format conversion. | Martin Jones | 2009-05-01 | 4 | -28/+44 |
| | | | | | |||||
| * | | | | Support userStyleSheetUrl. | Warwick Allison | 2009-05-01 | 1 | -0/+20 |
| | |/ / | |/| | | |||||
* | | | | Doc work. | Michael Brasser | 2009-05-01 | 25 | -262/+429 |
|/ / / | |||||
* | | | 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 | ||||
| * | | | 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 |
| | | | |