diff options
Diffstat (limited to 'src/qml/doc/src/qmllanguageref/syntax/basics.qdoc')
-rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/basics.qdoc | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/basics.qdoc b/src/qml/doc/src/qmllanguageref/syntax/basics.qdoc index 9eb8f72cf2..ce2e48d41a 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/basics.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/basics.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 qtqml-syntax-basics.html \title QML Syntax Basics @@ -48,7 +24,7 @@ A QML document may have one or more imports at the top of the file. An import can be any one of: \list -\li a versioned namespace into which types have been registered (e.g., by a plugin) +\li a QML Module \li a relative directory which contains type-definitions as QML documents \li a JavaScript file \endlist @@ -57,10 +33,9 @@ JavaScript file imports must be qualified when imported, so that the properties The generic form of the various imports are as follows: \list -\li \tt{import Namespace VersionMajor.VersionMinor} -\li \tt{import Namespace VersionMajor.VersionMinor as SingletonTypeIdentifier} -\li \tt{import "directory"} -\li \tt{import "file.js" as ScriptIdentifier} +\li \tt{import <ModuleIdentifier> [<Version.Number>] [as <Qualifier>]} +\li \tt{import "<Directory>"} +\li \tt{import "<JavaScriptFile>" [as <ScriptIdentifier>]} \endlist Examples: |