summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptextqobject
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Merge commit 'qt/master'Jason Barron2009-08-211-36/+62
|\ \
| * | invalidate wrapped JSC::JSValue when script engine is deletedKent Hansen2009-08-191-3/+1
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-121-1/+1
| |\ \
| * | | merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-061-38/+66
* | | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| |/ /
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-102-2/+8
|/ /
* | Merge commit 'origin/4.5'Rohan McGovern2009-08-062-4/+153
|/
* Cleaned up test naming and platform-specific tests.Rohan McGovern2009-08-063-0/+2740