summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-05109-2088/+2681
|\
| * Store the location for the `default' token.Roberto Raggi2009-05-043-5/+15
| * Extended the test for QmlDomValueValueSource.Erik Verbruggen2009-05-041-1/+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...Erik Verbruggen2009-05-041-2/+10
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-041-4/+6
| | |\
| | * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-2/+10
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Erik Verbruggen2009-05-041-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Kai Koehne2009-05-0412-22/+22
| | |\ \
| | * | | Fix example in documentationKai Koehne2009-05-041-2/+2
| * | | | Added (failing) testcase for QmlDomValueValueSource.Erik Verbruggen2009-05-041-0/+19
| | |/ / | |/| |
| * | | 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-0412-21/+19
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-042-9/+3
| | |\ \ | | | |/
| | | * Fix script snippet in test exampleKai Koehne2009-05-041-1/+1
| | * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-0411-20/+18
| * | | Fixed initialization for QmlDomValueBinding.Erik Verbruggen2009-05-041-1/+2
| | |/ | |/|
| * | Fix QmlDom breakageKai Koehne2009-05-041-8/+2
| |/
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-044-628/+582
| |\
| | * Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY.Roberto Raggi2009-05-044-628/+582
| * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-042-4/+6
| |/
| * Use QML signal syntaxAaron Kennedy2009-05-014-11/+4
| * Use QML properties syntaxAaron Kennedy2009-05-0123-130/+68
| * 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-0110-70/+79
| | |\
| | * | 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-016-42/+37
| * | Correct doc.Michael Brasser2009-05-011-3/+3
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0125-1111/+1328
| |\ \ | | |/
| | * 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-0134-1203/+1529
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0125-262/+429
| | | |\
| | | * | CompileAaron Kennedy2009-05-011-1/+1
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0118-115/+180
| | | |\ \
| | | * | | Tweak QML property syntaxAaron Kennedy2009-05-018-940/+1099
| | * | | | Ensure baseUrl is set.Warwick Allison2009-05-011-7/+7
| | | |/ / | | |/| |
| * | | | Doc work.Michael Brasser2009-05-013-25/+39
| | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0113-87/+149
| |\ \ \ | | |/ /
| | * | 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-0111-86/+128
| | |\ \
| | * | | Support userStyleSheetUrl.Warwick Allison2009-05-011-0/+20
| * | | | Doc work.Michael Brasser2009-05-0125-262/+429
| |/ / /