summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptvalue/tst_qscriptvalue.h
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-25 18:17:16 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-02-25 18:17:16 (GMT)
commitcf58c6bd5204edaff0a34bae5312798fc3700c94 (patch)
tree600e48add5404922ee866fe0bdf5f36340dfba39 /tests/auto/qscriptvalue/tst_qscriptvalue.h
parent2d89ee9cc302f7d381275a112e1c8a5de55ec286 (diff)
parentff8c63b4b40b26291f8847830e04f773dc1a1e71 (diff)
downloadQt-cf58c6bd5204edaff0a34bae5312798fc3700c94.zip
Qt-cf58c6bd5204edaff0a34bae5312798fc3700c94.tar.gz
Qt-cf58c6bd5204edaff0a34bae5312798fc3700c94.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'tests/auto/qscriptvalue/tst_qscriptvalue.h')
-rw-r--r--tests/auto/qscriptvalue/tst_qscriptvalue.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h
index 6215506..a5c7b45 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h
@@ -89,11 +89,11 @@ private slots:
void isObject_data();
void isObject();
-// void isQMetaObject_data();
-// void isQMetaObject();
+ void isQMetaObject_data();
+ void isQMetaObject();
-// void isQObject_data();
-// void isQObject();
+ void isQObject_data();
+ void isQObject();
void isRegExp_data();
void isRegExp();
@@ -107,8 +107,8 @@ private slots:
void isValid_data();
void isValid();
-// void isVariant_data();
-// void isVariant();
+ void isVariant_data();
+ void isVariant();
void toBool_data();
void toBool();