summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-0517-1007/+80
|\
| * 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
* | Remove Painted, have WebView use ImageItemIan Walters2009-05-056-503/+24
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0517-667/+633
|\
| * 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
| * 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
* | Improve error handling consistencyAaron Kennedy2009-05-0521-131/+493
|/
* 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
* | | Add QML signal declaration syntaxAaron Kennedy2009-05-018-824/+851
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0112-360/+517
|\ \ | |/
| * docWarwick Allison2009-05-016-109/+136
| * docWarwick Allison2009-05-016-251/+381
* | Rename QFxView::setXml to QFxView::setQml.Michael Brasser2009-05-013-33/+28
* | Correct doc.Michael Brasser2009-05-011-3/+3
|/
* docWarwick Allison2009-05-018-74/+92
* docWarwick Allison2009-05-017-57/+68
* docWarwick Allison2009-05-011-18/+39
* Remove userStyleSheetUrl.Warwick Allison2009-05-011-15/+23
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0118-995/+1150
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-019-54/+50
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-019-87/+98
| | |\
| | * | Doc work.Michael Brasser2009-05-019-54/+50
| * | | CompileAaron Kennedy2009-05-011-1/+1
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0114-115/+129
| |\ \ \ | | | |/ | | |/|
| * | | Tweak QML property syntaxAaron Kennedy2009-05-018-940/+1099
* | | | Ensure baseUrl is set.Warwick Allison2009-05-011-7/+7
| |/ / |/| |
* | | Small fix for QXmlListModel.Yann Bodson2009-05-011-1/+1
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-017-86/+77
|\ \ \
| * | | More format changes.Martin Jones2009-05-012-11/+14
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0120-922/+1031
| |\ \ \ | | | |/ | | |/|