diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-29 06:39:31 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-29 06:39:31 (GMT) |
| commit | 4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4 (patch) | |
| tree | 9adb0250ed390477e37741de97bede2bae148f7e /tests/auto/qscriptvalue/tst_qscriptvalue.h | |
| parent | f7d66442963e1380a4f2db3d24cb24aa9d5c63ad (diff) | |
| parent | bf5571b485420a945e9fdf3bf5b31cfe4c4d482b (diff) | |
| download | Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.zip Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.tar.gz Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.tar.bz2 | |
Merge remote branch 'origin/master' into lighthouse-master
Diffstat (limited to 'tests/auto/qscriptvalue/tst_qscriptvalue.h')
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h index 7bf0b66..46f5526 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.h +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h @@ -91,6 +91,8 @@ private slots: void toUInt32(); void toUInt16(); void toVariant(); + void toQObject_nonQObject_data(); + void toQObject_nonQObject(); void toQObject(); void toDateTime(); void toRegExp(); @@ -155,7 +157,18 @@ private slots: void call_array(); void call_nonFunction_data(); void call_nonFunction(); + void construct_nonFunction_data(); + void construct_nonFunction(); + void construct_simple(); + void construct_newObjectJS(); + void construct_undefined(); + void construct_newObjectCpp(); + void construct_arg(); + void construct_proto(); + void construct_returnInt(); + void construct_throw(); void construct(); + void construct_twoEngines(); void construct_constructorThrowsPrimitive(); void castToPointer(); void prettyPrinter_data(); |