summaryrefslogtreecommitdiffstats
path: root/doc/src/scripting
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-19 12:00:31 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-19 12:07:15 (GMT)
commit8e401cd4ae0133531613a3e097acc57979d78f50 (patch)
tree58e7572913a2c0d38af6a321fc44a5566a9b859d /doc/src/scripting
parenta1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d (diff)
parent732e0d01df867200546ddb5e6f8695f263e1ee0d (diff)
downloadQt-8e401cd4ae0133531613a3e097acc57979d78f50.zip
Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.gz
Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.bz2
Merge branch '4.6' of oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/scripting')
-rw-r--r--doc/src/scripting/scripting.qdoc12
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/src/scripting/scripting.qdoc b/doc/src/scripting/scripting.qdoc
index e99be70..b2ce8d1 100644
--- a/doc/src/scripting/scripting.qdoc
+++ b/doc/src/scripting/scripting.qdoc
@@ -1805,15 +1805,9 @@
\section1 ECMAScript Compatibility
- QtScript implements all the built-in classes and functions defined
- in ECMA-262.
-
- The Date parsing and string conversion functions are implemented using
- QDateTime::fromString() and QDateTime::toString(), respectively.
-
- The RegExp class is a wrapper around QRegExp. The QRegExp semantics
- do not precisely match the semantics for regular expressions defined
- in ECMA-262.
+ QtScript implements all the built-in objects and properties defined
+ in the \l{ECMA-262} standard; see the
+ \l{ECMAScript Reference}{ECMAScript reference} for an overview.
\section1 QtScript Extensions to ECMAScript