diff options
Diffstat (limited to 'src/qml/doc/src/javascript/functionlist.qdoc')
-rw-r--r-- | src/qml/doc/src/javascript/functionlist.qdoc | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/src/qml/doc/src/javascript/functionlist.qdoc b/src/qml/doc/src/javascript/functionlist.qdoc index 7a6a922480..d656bc2234 100644 --- a/src/qml/doc/src/javascript/functionlist.qdoc +++ b/src/qml/doc/src/javascript/functionlist.qdoc @@ -1,37 +1,13 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** 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. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qtqml-javascript-functionlist.html \title List of JavaScript Objects and Functions \brief A list of objects, functions, and properties supported in QML. This reference contains a list of objects, functions and - properties supported by the \l{QQmlEngine}{QML engine}. For a detailed - description, see the \l{ECMA-262} specification. + properties supported by the \l{QJSEngine}{JavaScript engine} in Qt. + For a detailed description, see the \l{ECMA-262} specification. \section1 The Global Object @@ -233,9 +209,9 @@ \li [Symbol.iterator]() \endlist - Additionally, the QML engine adds the following functions to the \l String prototype: + Additionally, the QML engine adds the following functions to the \c String prototype: \list - \li \l {String::arg}{arg()} + \li \l {string}{string::arg()} \endlist |