summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0617-82/+220
|\ | | | | | | 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-055-20/+30
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-058-34/+61
| |\ | | | | | | | | | 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
| | * Fixed qml's variant and color animations when started without transitionLeonardo Sobral Cunha2009-05-052-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::sourceKai Koehne2009-05-051-2/+2
| | | | | | | | | | | | see commit 94a69804
| | * 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
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-05107-3409/+2075
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-051-0/+47
| | |
* | | Use <propname>Changed() signal as the notify signal for dynamic propertiesAaron Kennedy2009-05-061-2/+2
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-053-45/+114
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-05101-3358/+1912
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Stream video recording.Warwick Allison2009-05-052-61/+71
| | | |
| * | | ffmpeg supportWarwick Allison2009-05-053-21/+80
| | | | | | | | | | | | | | | | still image based for now, streaming next
* | | | Support simple nested property groupsAaron Kennedy2009-05-051-47/+47
| | | |
* | | | Remove misleading commentAaron Kennedy2009-05-051-6/+0
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-059-135/+214
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0534-794/+568
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | More doc cleanup.Michael Brasser2009-05-059-135/+214
| | | | |
* | | | | DocAaron Kennedy2009-05-053-546/+243
| |/ / / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0522-713/+396
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-055-25/+66
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0518-137/+284
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Rename QFxImageItem to QFxPaintedItem.Ian Walters2009-05-059-80/+77
| | | | | | | | | | | | | | | | | | | | | | | | Done to avoid confusion with QFxImage and QFxAnimatedImage(Item)
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0533-1509/+90
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Remove Painted, have WebView use ImageItemIan Walters2009-05-056-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 Walters2009-05-05242-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 Walters2009-05-0110-147/+312
| | | | | | | |
* | | | | | | | 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!"); } }
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0518-137/+284
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0548-1751/+608
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | More doc conversion and cleanup.Michael Brasser2009-05-0513-129/+191
| | | | | | |
| * | | | | | Improve QML documentation viewing in Assistant.Michael Brasser2009-05-055-8/+93
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers.
* | | | | | Remove qmlconvAaron Kennedy2009-05-051-1/+1
| | | | | |
* | | | | | QtScript must respect dynamic metaobject's when installedAaron Kennedy2009-05-051-1/+1
| | | | | |
* | | | | | Add parser support for object slot declarationsAaron Kennedy2009-05-053-23/+64
| |/ / / / |/| | | |
* | | | | 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-0513-249/+17
| | | | |
* | | | | Remove QML XML supportAaron Kennedy2009-05-058-1005/+0
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-057-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-05-0547-980/+1317
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Minehunt switched to KDE smiley facesAlan Alpert2009-05-057-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Minehunt example now meets minimum aesthetic requirements.
* | | | | | | 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-0526-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 Jones2009-05-052-0/+17
| | | | | |