summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0611-51/+131
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Inserted the semicolon at the end of the previous token.Roberto Raggi2009-05-052-2/+8
| |
| * qdoc: Corrected some qdoc warnings.Martin Smith2009-05-053-9/+25
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-055-14/+24
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Remove declaration of loadError from QmlDomDocumentKai Koehne2009-05-051-1/+0
| | | | | | | | | | | | Implementation was already removed in c7a0cae7deb6e31c
| | * Removed dependency of QmlContext to QmlCompiledComponentKai Koehne2009-05-054-13/+24
| | | | | | | | | | | | | | | | | | Store component url directly in context, instead of referencing the associated QmlCompiledComponent. In addition, allow to explicitly set the base url to a context. This is needed for Bauhaus.
| * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-053-31/+79
| |/
* | Use <propname>Changed() signal as the notify signal for dynamic propertiesAaron Kennedy2009-05-061-2/+2
| |
* | Support simple nested property groupsAaron Kennedy2009-05-051-47/+47
| |
* | Remove misleading commentAaron Kennedy2009-05-051-6/+0
|/
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0510-79/+170
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Very basic slot declaration supportAaron Kennedy2009-05-057-56/+106
| | | | | | | | | | | | | | | | | | | | Currently only parameterless slots are supported. They are declared inline with the object: Rect { function mySlot() { print("Hello world!"); } }
| * Add parser support for object slot declarationsAaron Kennedy2009-05-053-23/+64
| |
* | More doc cleanup.Michael Brasser2009-05-055-5/+15
|/
* Add warning textAaron Kennedy2009-05-051-1/+5
|
* Remove magic "properties" and "signals" property supportAaron Kennedy2009-05-054-249/+3
| | | | | | | New properties and signals should be defined using the QML syntax: [default] property <type> <name> [: <expr>] signal <name>
* Remove XML custom parser supportAaron Kennedy2009-05-055-65/+7
|
* Remove QML XML supportAaron Kennedy2009-05-056-513/+0
|
* Fix QmlComponent::isError() after QmlComponent::create()Aaron Kennedy2009-05-051-2/+2
|
* Mark DOM API as internal for nowAaron Kennedy2009-05-051-0/+9
|
* QmlError docAaron Kennedy2009-05-052-0/+51
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-057-656/+614
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmldom.cpp
| * Store the location for the `default' token.Roberto Raggi2009-05-043-5/+15
| |
| * Fixed QmlDomValueValueSource::object() to actually return the newly created ↵Erik Verbruggen2009-05-041-1/+1
| | | | | | | | object.
| * Merge branch 'kinetic-declarativeui' of ↵Kai Koehne2009-05-042-12/+12
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fixed initialization for QmlDomValueValueSource.Erik Verbruggen2009-05-041-1/+2
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Erik Verbruggen2009-05-041-10/+8
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-041-8/+2
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-10/+8
| | | | |
| | * | | Fixed initialization for QmlDomValueBinding.Erik Verbruggen2009-05-041-1/+2
| | | |/ | | |/|
| * | | Fix example in documentationKai Koehne2009-05-041-2/+2
| |/ / | | | | | | | | | src has been replaced by source in QFxImage
| * | 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
| * Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY.Roberto Raggi2009-05-044-628/+582
| |
* | Improve error handling consistencyAaron Kennedy2009-05-0519-127/+415
|/
* Correctly set the JsIdentifier svalAaron Kennedy2009-05-012-4/+14
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-012-98/+140
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * docWarwick Allison2009-05-012-98/+140
| |
* | 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 ↵Aaron Kennedy2009-05-011-0/+1
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Doc work.Michael Brasser2009-05-011-0/+1
| |
* | 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"
* 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" }
* Report the syntax errors.Roberto Raggi2009-04-301-1/+38
|
* Removed a fiew compilation warnings on MSVCThierry Bastian2009-04-302-1/+3
|
* Accept "return" and reserved words as property namesAaron Kennedy2009-04-305-749/+879
|
* Fix crash in QmlDomDocument::load()Aaron Kennedy2009-04-302-3/+19
|
* Make custom parsers internal.Aaron Kennedy2009-04-309-153/+154
| | | | 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-307-698/+686
|\ | | | | | | | | | | | | | | 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
| * 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.