summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-3/+28
|\
| * qtscript meta-object binding: enum properties are not deletableKent Hansen2009-06-261-1/+10
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | * Long live Qt 4.5!Lars Knoll2009-03-231-0/+2734
| * add a bunch of qtscript autotestsKent Hansen2009-06-151-0/+16
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-2/+93
|\ \ | |/
| * make signal handlers understand QVariant againKent Hansen2009-06-051-0/+29
| * Add string-->enum conversion for properties and slotsKent Hansen2009-05-201-2/+64
| * Long live Qt!Lars Knoll2009-03-231-0/+2734
* Long live Qt for S60!axis2009-04-241-0/+2738