diff options
Diffstat (limited to 'src/qml/doc/src/qmllanguageref/qmlreference.qdoc')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/qmlreference.qdoc | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc index 901a4a57fe..7f92129fcf 100644 --- a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc +++ b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** 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 qmlreference.html @@ -38,7 +14,7 @@ In addition, QML heavily uses Qt, which allows types and other Qt features to be accessible directly from QML applications. This reference guide describes the features of the QML language. Many of the -QML types in the guide originate from the \l{Qt QML} or \l{Qt Quick} +QML types in the guide originate from the \l{Qt Qml} or \l{Qt Quick} modules. \list @@ -73,17 +49,20 @@ modules. \li \l{qtqml-javascript-resources.html}{Defining JavaScript Resources In QML} \li \l{qtqml-javascript-imports.html}{Importing JavaScript Resources In QML} \li \l{qtqml-javascript-hostenvironment.html}{JavaScript Host Environment} + \li \l{qtqml-javascript-finetuning.html}{Configuring the JavaScript engine} \endlist \li \l{qtqml-typesystem-topic.html}{The QML Type System} \list - \li \l{qtqml-typesystem-basictypes.html}{Basic Types} + \li \l{qtqml-typesystem-valuetypes.html}{QML Value Types} \li \l{qtqml-typesystem-topic.html#javascript-types}{JavaScript Types} \li \l{qtqml-typesystem-objecttypes.html}{QML Object Types} \list \li \l{qtqml-documents-definetypes.html}{Defining Object Types from QML} \li \l{qtqml-cppintegration-definetypes.html}{Defining Object Types from C++} \endlist + \li \l{qtqml-typesystem-sequencetypes.html}{QML Sequence Types} + \li \l{qtqml-typesystem-namespaces.html}{QML Namespaces} \endlist \li \l{qtqml-modules-topic.html}{QML Modules} |