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 | 107 | -3409/+2075 |
| |\ | | | | | | | | | | 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 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 3 | -45/+114 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-05 | 101 | -3358/+1912 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Stream video recording. | Warwick Allison | 2009-05-05 | 2 | -61/+71 |
| | | | | |||||
| * | | | ffmpeg support | Warwick Allison | 2009-05-05 | 3 | -21/+80 |
| | | | | | | | | | | | | | | | | still image based for now, streaming next | ||||
* | | | | 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 ↵ | Aaron Kennedy | 2009-05-05 | 9 | -135/+214 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-05 | 34 | -794/+568 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | More doc cleanup. | Michael Brasser | 2009-05-05 | 9 | -135/+214 |
| | | | | | |||||
* | | | | | Doc | Aaron Kennedy | 2009-05-05 | 3 | -546/+243 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 22 | -713/+396 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-05 | 5 | -25/+66 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-05 | 18 | -137/+284 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | 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 | 33 | -1509/+90 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-05 | 242 | -4939/+7570 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/tutorials/declarative.qdoc | ||||
| * | | | | | | | Review of chapters 1 and 2 of tutorial. | Ian Walters | 2009-05-01 | 10 | -147/+312 |
| | | | | | | | | |||||
* | | | | | | | | 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 | 18 | -137/+284 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-05 | 48 | -1751/+608 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | More doc conversion and cleanup. | Michael Brasser | 2009-05-05 | 13 | -129/+191 |
| | | | | | | | |||||
| * | | | | | | Improve QML documentation viewing in Assistant. | Michael Brasser | 2009-05-05 | 5 | -8/+93 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers. | ||||
* | | | | | | Remove qmlconv | Aaron Kennedy | 2009-05-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | QtScript must respect dynamic metaobject's when installed | Aaron Kennedy | 2009-05-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Add parser support for object slot declarations | Aaron Kennedy | 2009-05-05 | 3 | -23/+64 |
| |/ / / / |/| | | | | |||||
* | | | | | 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 | 13 | -249/+17 |
| | | | | | |||||
* | | | | | Remove QML XML support | Aaron Kennedy | 2009-05-05 | 8 | -1005/+0 |
| | | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 7 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-05-05 | 47 | -980/+1317 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | Minehunt switched to KDE smiley faces | Alan Alpert | 2009-05-05 | 7 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minehunt example now meets minimum aesthetic requirements. | ||||
* | | | | | | | 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 | 26 | -850/+757 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmldom.cpp | ||||
| * | | | | | Add not-yet-working Content example. | Martin Jones | 2009-05-05 | 2 | -0/+17 |
| | | | | | |