summaryrefslogtreecommitdiffstats
path: root/src/script/bridge/qscriptdeclarativeobject.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-171-34/+4
|\
| * Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-101-34/+4
* | Integrate QML's object ownership with the JS collectorAaron Kennedy2010-03-091-0/+17
|/
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-141-1/+1
|\
| * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141-1/+1
| |\
| | * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | | Support calling in QScriptDeclarativeClassAaron Kennedy2010-01-141-1/+30
|/ /
* | Optimization: Add QScriptDeclarativeClass::ValueAaron Kennedy2010-01-111-2/+2
|/
* Fixed the QtScript license information in the source files to referSimon Hausmann2009-11-171-19/+1
* Replace LGPL license tags with LGPL-ONLYSimon Hausmann2009-11-171-1/+1
* Add QScriptDeclarativeClassAaron Kennedy2009-11-101-0/+192