diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-06-30 13:09:30 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-06-30 13:09:30 (GMT) |
| commit | 32b1c124b4f90568ce1753fb52617df038bbbf1f (patch) | |
| tree | 7accbc2da4b2bdc419056000d3b93808e8720b17 /src/script/api/qscriptvalue.cpp | |
| parent | 3a2a6e8746b5076b5b7f496444479fa40067731c (diff) | |
| parent | 38a04b3a8c7a33f1636008e04d58690febcc22f5 (diff) | |
| download | Qt-32b1c124b4f90568ce1753fb52617df038bbbf1f.zip Qt-32b1c124b4f90568ce1753fb52617df038bbbf1f.tar.gz Qt-32b1c124b4f90568ce1753fb52617df038bbbf1f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 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() |