summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptextqobject
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-011-0/+140
|\
| * Usefully convert from QtScript object/array to QVariantKent Hansen2010-06-171-0/+140
* | Fix conversion between QVariant and QScriptValue.Jedrzej Nowacki2010-04-301-4/+18
|/
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-0/+34
|\
| * QtScript: Add autotest for enumeration of QMetaObject propertiesKent Hansen2010-04-151-0/+34
* | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-241-0/+87
|/
* Remove QtScript connection when receiver QObject has been deletedKent Hansen2010-01-191-0/+23
* don't assert when calling QtScript-wrapped method of deleted QObjectKent Hansen2010-01-181-1/+10
* add tests for QFlags behavior in QtScriptKent Hansen2010-01-141-1/+56
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-021-0/+23
|\
| * make signal handlers understand QVariant againKent Hansen2009-11-301-0/+29
| * Update license headers again.Jason McDonald2009-09-081-4/+4
* | QtScript: Compatibility with 4.5Olivier Goffart2009-10-221-0/+24
* | Removed explicit TARGET.EPOCHEAPSIZE statements from script testsMiikka Heikkinen2009-09-231-4/+0
* | Update license headers again.Jason McDonald2009-09-091-4/+4
* | 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