Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-06 | 17 | -82/+220 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Inserted the semicolon at the end of the previous token. | Roberto Raggi | 2009-05-05 | 2 | -2/+8 |
| | | |||||
| * | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-05-05 | 5 | -20/+30 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-05-05 | 8 | -34/+61 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Remove declaration of loadError from QmlDomDocument | Kai Koehne | 2009-05-05 | 1 | -1/+0 |
| | | | | | | | | | | | | Implementation was already removed in c7a0cae7deb6e31c | ||||
| | * | Fixed qml's variant and color animations when started without transition | Leonardo Sobral Cunha | 2009-05-05 | 2 | -18/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | When the 'from' field is not set, it was not updated after running an animation twice. Now the color and variant animations behave as the numeric one, updating the 'from' value at the start of each run. Reviewed-by: Michael Brasser | ||||
| | * | Doc fix - Image::src has been renamed to QFxImage::source | Kai Koehne | 2009-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | see commit 94a69804 | ||||
| | * | Removed dependency of QmlContext to QmlCompiledComponent | Kai Koehne | 2009-05-05 | 4 | -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 Smith | 2009-05-05 | 3 | -31/+79 |
| |/ | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-05-05 | 56 | -1882/+1015 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-05-05 | 1 | -0/+47 |
| | | | |||||
* | | | Use <propname>Changed() signal as the notify signal for dynamic properties | Aaron Kennedy | 2009-05-06 | 1 | -2/+2 |
| | | | |||||
* | | | Support simple nested property groups | Aaron Kennedy | 2009-05-05 | 1 | -47/+47 |
| | | | |||||
* | | | Remove misleading comment | Aaron Kennedy | 2009-05-05 | 1 | -6/+0 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-05 | 22 | -647/+256 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 12 | -568/+86 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-05 | 3 | -23/+64 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-05 | 7 | -27/+27 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Rename QFxImageItem to QFxPaintedItem. | Ian Walters | 2009-05-05 | 9 | -80/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | Done to avoid confusion with QFxImage and QFxAnimatedImage(Item) | ||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-05 | 17 | -1007/+80 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Remove Painted, have WebView use ImageItem | Ian Walters | 2009-05-05 | 6 | -503/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reducing duplicated code and functionality. Removing QFxPainted as it isn't used and has less features than QFxImageItem, which fufills the same roles. Have QFxWebView use QFxImageItem as a base to reduce duplicated caching code. Minimal risk given that QFxImageItem is based of QFxWebView. | ||||
| * | | | | | | Very basic slot declaration support | Aaron Kennedy | 2009-05-05 | 7 | -56/+106 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only parameterless slots are supported. They are declared inline with the object: Rect { function mySlot() { print("Hello world!"); } } | ||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 7 | -27/+27 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | Add parser support for object slot declarations | Aaron Kennedy | 2009-05-05 | 3 | -23/+64 |
| | |_|/ / | |/| | | | |||||
* | | | | | More doc cleanup. | Michael Brasser | 2009-05-05 | 9 | -135/+214 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-05 | 26 | -1072/+507 |
|\ \ \ \ | |/ / / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Add warning text | Aaron Kennedy | 2009-05-05 | 1 | -1/+5 |
| | | | | |||||
| * | | | Remove magic "properties" and "signals" property support | Aaron Kennedy | 2009-05-05 | 4 | -249/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | New properties and signals should be defined using the QML syntax: [default] property <type> <name> [: <expr>] signal <name> | ||||
| * | | | Remove XML custom parser support | Aaron Kennedy | 2009-05-05 | 6 | -242/+10 |
| | | | | |||||
| * | | | Remove QML XML support | Aaron Kennedy | 2009-05-05 | 6 | -513/+0 |
| | | | | |||||
| * | | | Fix QmlComponent::isError() after QmlComponent::create() | Aaron Kennedy | 2009-05-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Mark DOM API as internal for now | Aaron Kennedy | 2009-05-05 | 1 | -0/+9 |
| | | | | |||||
| * | | | QmlError doc | Aaron Kennedy | 2009-05-05 | 2 | -0/+51 |
| |/ / | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 8 | -658/+624 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmldom.cpp | ||||
| * | | | Improve error handling consistency | Aaron Kennedy | 2009-05-05 | 21 | -131/+493 |
| | | | | |||||
* | | | | More doc conversion and cleanup. | Michael Brasser | 2009-05-05 | 7 | -27/+27 |
| |/ / |/| | | |||||
* | | | Store the location for the `default' token. | Roberto Raggi | 2009-05-04 | 3 | -5/+15 |
| | | | |||||
* | | | Fixed QmlDomValueValueSource::object() to actually return the newly created ↵ | Erik Verbruggen | 2009-05-04 | 1 | -1/+1 |
| |/ |/| | | | | | object. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-05-04 | 1 | -4/+6 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Kai Koehne | 2009-05-04 | 2 | -12/+12 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Fixed initialization for QmlDomValueValueSource. | Erik Verbruggen | 2009-05-04 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Erik Verbruggen | 2009-05-04 | 1 | -10/+8 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Fixed initialization for QmlDomValueBinding. | Erik Verbruggen | 2009-05-04 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Fix example in documentation | Kai Koehne | 2009-05-04 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | src has been replaced by source in QFxImage | ||||
* | | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-05-04 | 1 | -2/+10 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-05-04 | 1 | -8/+2 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | 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 | ||||
* | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-05-04 | 1 | -10/+8 |
|/ / | |||||
* | | Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY. | Roberto Raggi | 2009-05-04 | 4 | -628/+582 |
|/ | |||||
* | Correctly set the JsIdentifier sval | Aaron Kennedy | 2009-05-01 | 2 | -4/+14 |
| |