summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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 git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-058-34/+61
|\
| * Remove declaration of loadError from QmlDomDocumentKai Koehne2009-05-051-1/+0
| * Fixed qml's variant and color animations when started without transitionLeonardo Sobral Cunha2009-05-052-18/+35
| * Doc fix - Image::src has been renamed to QFxImage::sourceKai Koehne2009-05-051-2/+2
| * Removed dependency of QmlContext to QmlCompiledComponentKai Koehne2009-05-054-13/+24
* | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-053-31/+79
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-0557-1883/+1016
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0523-648/+257
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0512-568/+86
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-054-24/+65
| | | |\
| | | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-057-27/+27
| | | |\ \
| | | * | | Rename QFxImageItem to QFxPaintedItem.Ian Walters2009-05-059-80/+77
| | | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-0517-1007/+80
| | | |\ \ \
| | | * | | | Remove Painted, have WebView use ImageItemIan Walters2009-05-056-503/+24
| | * | | | | Very basic slot declaration supportAaron Kennedy2009-05-057-56/+106
| | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-057-27/+27
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | 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
| | | |_|/ | | |/| |
| * | | | More doc cleanup.Michael Brasser2009-05-059-135/+214
| | |/ / | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0526-1072/+507
| |\ \ \ | | |/ /
| | * | Add warning textAaron Kennedy2009-05-051-1/+5
| | * | Remove magic "properties" and "signals" property supportAaron Kennedy2009-05-054-249/+3
| | * | Remove XML custom parser supportAaron Kennedy2009-05-056-242/+10
| | * | 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 git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0517-667/+633
| | |\
| | * | Improve error handling consistencyAaron Kennedy2009-05-0521-131/+493
| * | | More doc conversion and cleanup.Michael Brasser2009-05-057-27/+27
| | |/ | |/|
| * | Store the location for the `default' token.Roberto Raggi2009-05-043-5/+15
| * | Fixed QmlDomValueValueSource::object() to actually return the newly created o...Erik Verbruggen2009-05-041-1/+1
* | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-051-0/+47
|/ /
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-041-4/+6
|\ \
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Kai Koehne2009-05-0411-21/+21
| |\ \
| | * | Fixed initialization for QmlDomValueValueSource.Erik Verbruggen2009-05-041-1/+2
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Erik Verbruggen2009-05-0410-19/+17
| | |\ \
| | * | | Fixed initialization for QmlDomValueBinding.Erik Verbruggen2009-05-041-1/+2
| * | | | Fix example in documentationKai Koehne2009-05-041-2/+2
| |/ / /
* | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-2/+10
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-041-8/+2
|\ \ \ | |/ /
| * | Fix QmlDom breakageKai Koehne2009-05-041-8/+2
* | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-0410-19/+17
|/ /
* | Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY.Roberto Raggi2009-05-044-628/+582
|/
* Correctly set the JsIdentifier svalAaron Kennedy2009-05-012-4/+14
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-013-120/+174
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-014-36/+31
| |\
| * | docWarwick Allison2009-05-013-120/+174