diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-18 11:34:11 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-18 11:34:11 (GMT) |
| commit | 678d6044cb82b59e2a3747a24f5d70a58f5cf127 (patch) | |
| tree | 811af412e92ce107222f57e80816faab3963655b /src/script/api/qscriptvalue.cpp | |
| parent | 68073bbcde2d1b12d36f0c58aab1fc20f02ab967 (diff) | |
| parent | 81b03ee252a22c9b053c376302428e5430523900 (diff) | |
| download | Qt-678d6044cb82b59e2a3747a24f5d70a58f5cf127.zip Qt-678d6044cb82b59e2a3747a24f5d70a58f5cf127.tar.gz Qt-678d6044cb82b59e2a3747a24f5d70a58f5cf127.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc into 4.7
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 1310c8c..451d1b0 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -1215,8 +1215,8 @@ qsreal QScriptValue::toInteger() const \row \o QObject Object \o A QVariant containing a pointer to the QObject. \row \o Date Object \o A QVariant containing the date value (toDateTime()). \row \o RegExp Object \o A QVariant containing the regular expression value (toRegExp()). - \row \o Array Object \o The array is converted to a QVariantList. - \row \o Object \o If the value is primitive, then the result is converted to a QVariant according to the above rules; otherwise, an invalid QVariant is returned. + \row \o Array Object \o The array is converted to a QVariantList. Each element is converted to a QVariant, recursively; cyclic references are not followed. + \row \o Object \o The object is converted to a QVariantMap. Each property is converted to a QVariant, recursively; cyclic references are not followed. \endtable \sa isVariant() |