summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Compile after merge.Michael Brasser2009-07-271-1/+1
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-2713-112/+106
|\
| * Added utility methods firstSourceLocation/lastSourceLocation methods toErik Verbruggen2009-07-271-0/+21
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-273-3/+4
| |\
| * | Make private stuff privateAaron Kennedy2009-07-2712-112/+85
* | | Fix crashes on exit.Michael Brasser2009-07-272-10/+20
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-2715-56/+281
|\ \ | |/
| * Make privateAaron Kennedy2009-07-275-54/+61
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Henrik Hartz2009-07-279-1/+219
| |\
| | * Fixed project dependenciesRoberto Raggi2009-07-262-0/+3
| | * Added formal parameters to the QML signals.Roberto Raggi2009-07-267-1/+216
| * | compile fixHenrik Hartz2009-07-271-1/+1
| |/
* | Make sure we pass through a line number for evaluating bindings.Michael Brasser2009-07-273-3/+4
|/
* Added objectClassName now that objectType is the fully-qualified typeErik Verbruggen2009-07-244-4/+25
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-242-0/+74
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Rhys Weatherley2009-07-2411-932/+1028
| |\
| * | Add QVector3D as a value type to QMLRhys Weatherley2009-07-242-0/+74
* | | Add the fully-qualified type name to the DOM (via QmlParser::Object)Warwick Allison2009-07-242-3/+4
* | | docWarwick Allison2009-07-241-3/+3
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-2421-1483/+1105
|\ \
| * | Recognize formal arguments in the left hand side of a binding.Roberto Raggi2009-07-245-967/+1038
| * | Accept the optional semicolon at the end of a signal declaration.Roberto Raggi2009-07-245-878/+903
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-2416-1469/+995
| |\ \ | | |/
| | * Make custom string converters work for builtin variant metatypesRhys Weatherley2009-07-241-2/+1
| | * Removed support for CSS-like literals.Roberto Raggi2009-07-2410-263/+49
| | * Revert "Introduced annotations"Roberto Raggi2009-07-2410-1204/+945
| | * Revert "Fixed the semantic action of UiArrayMemberList"Roberto Raggi2009-07-242-2/+2
| * | Rename QmlBindableComponent to QmlComponentJS, as per Aaron's request.Alan Alpert2009-07-245-35/+35
| |/
* | Fix assertWarwick Allison2009-07-241-1/+1
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-232-2/+2
|\
| * Fixed the semantic action of UiArrayMemberListRoberto Raggi2009-07-232-2/+2
* | Move import access functions to QmlEnginePrivate.Warwick Allison2009-07-2310-98/+174
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-2331-1098/+1991
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-2325-1069/+1962
| |\
| | * Introduced annotationsRoberto Raggi2009-07-2310-945/+1204
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-239-31/+289
| | |\
| | * | Add prototype value type supportAaron Kennedy2009-07-2315-124/+758
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-232-4/+3
| |\ \ \ | | | |/ | | |/|
| | * | Fix State when handling.Michael Brasser2009-07-232-4/+3
| * | | Move errorsString to QmlBindableComponent because it's for use in scriptAlan Alpert2009-07-214-25/+26
| |/ /
* | | Temporary fix for Attached propertiesWarwick Allison2009-07-232-4/+4
* | | Allow span of versions to be defined, not just one.Warwick Allison2009-07-236-30/+64
* | | Move all QML types to Qt/4.6 namespace.Warwick Allison2009-07-236-25/+32
|/ /
* | Move the Script interface of QmlComponent to QmlBindableComponentAlan Alpert2009-07-217-27/+286
|/
* Remove unnecessary methods from QmlBindingAaron Kennedy2009-07-202-14/+3
* Prevent expression evaluation data from overlappingAaron Kennedy2009-07-202-4/+19
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-202-2/+1
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-201-1/+1
| |\
| | * Fix warning.Michael Brasser2009-07-201-1/+1
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-191-0/+5
| |\ \ | | |/