Changeset 846 for trunk/doc/src/scripting/ecmascript.qdoc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/scripting/ecmascript.qdoc (modified) (9 diffs)

trunk/doc/src/scripting/ecmascript.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
 **
 ** If you have questions regarding the use of this file, please contact
@@ -45 +31 @@
     \brief A list of objects, functions and properties supported by QtScript.
 
-    This reference contains a list of objects, functions and
-    properties supported by QtScript.
+    This reference contains a list of built-in objects, functions and
+    properties supported by QtScript. For a detailed description, see
+    the \l{ECMA-262} specification.
 
     \tableofcontents
@@ -58 +45 @@
     \o Infinity
     \o undefined
-    \o Math
     \endlist
 
@@ -95 +81 @@
     \endlist
 
+    \section2 Other Properties
+
+    \list
+    \o Math
+    \o JSON
+    \endlist
+
     \section1 Object Objects
 
+    \section2 Object Constructor
+
+    \section3 Function Properties
+
+    \list
+    \o getPrototypeOf(O)
+    \o getOwnPropertyDescriptor(O, P)
+    \o getOwnPropertyNames(O)
+    \o create(O [, Properties])
+    \o defineProperty(O, P, Attributes)
+    \o defineProperties(O, Properties)
+    \o keys(O)
+    \endlist
+
     \section2 Object Prototype Object
+
+    \section3 Function Properties
 
     \list
@@ -139 +148 @@
     \o splice(start, deleteCount[, item1 [, item2 [, ...]]])
     \o unshift([item1 [, item2 [, ...]]])
+    \o indexOf(searchElement [, fromIndex])
+    \o lastIndexOf(searchElement [, fromIndex])
+    \o every(callbackfn [, thisArg])
+    \o some(callbackfn [, thisArg])
+    \o forEach(callbackfn [, thisArg])
+    \o map(callbackfn [, thisArg])
+    \o filter(callbackfn [, thisArg])
+    \o reduce(callbackfn [, initialValue])
+    \o reduceRight(callbackfn [, initialValue])
     \endlist
 
@@ -166 +184 @@
     \o toUpperCase()
     \o toLocaleUpperCase()
+    \o trim()
     \endlist
 
@@ -279 +298 @@
     \o setUTCFullYear(year [, month [, date]])
     \o toUTCString()
+    \o toISOString()
+    \o toJSON()
     \endlist
 
@@ -310 +331 @@
     \endlist
 
+    \section1 The JSON Object
+
+    \section2 Function Properties
+
+    \list
+    \o parse(text [, reviver])
+    \o stringify(value [, replacer [, space]])
+    \endlist
+
 */