diff options
Diffstat (limited to 'src/quick/doc/src/tutorial.qdoc')
| -rw-r--r-- | src/quick/doc/src/tutorial.qdoc | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc index e84753d895..8c6fdae948 100644 --- a/src/quick/doc/src/tutorial.qdoc +++ b/src/quick/doc/src/tutorial.qdoc @@ -1,40 +1,16 @@ -/**************************************************************************** -** -** 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) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qml-tutorial.html \title QML Tutorial \brief An introduction to the basic concepts and features of QML. -\nextpage QML Tutorial 1 - Basic Types +\nextpage QML Tutorial 1 - Value Types This tutorial gives an introduction to QML, the language for Qt Quick UIs. It doesn't cover everything; the emphasis is on teaching the key principles, and features are introduced as needed. -Through the different steps of this tutorial we will learn about QML basic types, we will create our own QML component +Through the different steps of this tutorial we will learn about QML value types, we will create our own QML component with properties and signals, and we will create a simple animation with the help of states and transitions. Chapter one starts with a minimal "Hello world" program and the following chapters introduce new concepts. @@ -44,7 +20,7 @@ The tutorial's source code is located in the \c{examples/quick/tutorials/hellowo Tutorial chapters: \list 1 -\li \l {QML Tutorial 1 - Basic Types}{Basic Types} +\li \l {QML Tutorial 1 - Value Types}{Value Types} \li \l {QML Tutorial 2 - QML Components}{QML Components} \li \l {QML Tutorial 3 - States and Transitions}{States and Transitions} \endlist @@ -53,7 +29,7 @@ Tutorial chapters: /*! \page qml-tutorial1.html -\title QML Tutorial 1 - Basic Types +\title QML Tutorial 1 - Value Types \previouspage QML Tutorial \nextpage QML Tutorial 2 - QML Components @@ -100,18 +76,20 @@ The \c font.pointSize and \c font.bold properties are related to fonts and use t \section2 Viewing the Example -To view what you have created, run the \l{Prototyping with qmlscene}{qmlscene} tool (located in the \c bin directory) with your filename as the first argument. -For example, to run the provided completed Tutorial 1 example from the install location, you would type: +To view what you have created, run the +\l{Prototyping with the QML Runtime Tool}{qml tool} (located in the +\c bin directory) with your filename as the first argument. For example, to run +the provided completed Tutorial 1 example from the install location, you would type: \code -qmlscene tutorials/helloworld/tutorial1.qml +qml tutorials/helloworld/tutorial1.qml \endcode */ /*! \page qml-tutorial2.html \title QML Tutorial 2 - QML Components -\previouspage QML Tutorial 1 - Basic Types +\previouspage QML Tutorial 1 - Value Types \nextpage QML Tutorial 3 - States and Transitions This chapter adds a color picker to change the color of the text. |