diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-10-17 10:42:17 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-09 13:57:22 +0000 |
| commit | da4905875518f58c948c847c6218b1c3089d7acd (patch) | |
| tree | 8cdc109ad67b52616cab2b8cc861cb73387ab6f9 /src | |
| parent | 2dc0fc1a1bde457b4004667139f249e09d1c17eb (diff) | |
Doc: Restructure Qt QML TOC
Make sure that Reference is also a top-level element, and just list
the list of examples there, instead of a separate section. Move Licenses
and Attributions a bit up, so that Reference is the final section.
Change-Id: I2fa78f32a6994d7276bf37f5949348424383ff68
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit cb59815631a216b077a27e44b6886f7474b6496b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index 9d0a0e67a8..2da6a8c9e0 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -128,6 +128,20 @@ the QML code to interact with C++ code. \endlist \endomit +\section1 Licenses and Attributions + +Qt QML is available under commercial licenses from \l{The Qt Company}. +In addition, it is available under free software licenses. Since Qt 5.4, +these free software licenses are +\l{GNU Lesser General Public License, version 3}, or +the \l{GNU General Public License, version 2}. +See \l{Qt Licensing} for further details. + +Furthermore Qt QML in Qt \QtVersion may contain third party +modules under following permissive licenses: + +\generatelist{groupsbymodule attributions-qtqml} + \section1 Related Articles and Guides Further information for writing QML applications: @@ -146,30 +160,11 @@ Further information for writing QML applications: results \endlist -\section1 Examples - -\list - \li \l {Qt QML Examples} {Examples} -\endlist - -\section2 Reference +\section1 Reference \list \li \l {Qt QML C++ Classes} {C++ Classes} \li \l {Qt QML QML Types} {QML Types} + \li \l {Qt QML Examples} {Examples} \endlist - -\section1 Licenses and Attributions - -Qt QML is available under commercial licenses from \l{The Qt Company}. -In addition, it is available under free software licenses. Since Qt 5.4, -these free software licenses are -\l{GNU Lesser General Public License, version 3}, or -the \l{GNU General Public License, version 2}. -See \l{Qt Licensing} for further details. - -Furthermore Qt QML in Qt \QtVersion may contain third party -modules under following permissive licenses: - -\generatelist{groupsbymodule attributions-qtqml} */ |