diff options
Diffstat (limited to 'src/corelib/doc/src/qtcore-index.qdoc')
| -rw-r--r-- | src/corelib/doc/src/qtcore-index.qdoc | 93 |
1 files changed, 37 insertions, 56 deletions
diff --git a/src/corelib/doc/src/qtcore-index.qdoc b/src/corelib/doc/src/qtcore-index.qdoc index 390c44ab63..38452e1b2b 100644 --- a/src/corelib/doc/src/qtcore-index.qdoc +++ b/src/corelib/doc/src/qtcore-index.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qtcore-index.html @@ -38,8 +14,8 @@ \li a very powerful mechanism for seamless object communication called signals and slots \li queryable and designable object properties - \li hierarchical and queryable object trees that organize - \li object ownership in a natural way with guarded pointers (QPointer) + \li hierarchical and queryable object trees that organize object ownership + in a natural way with guarded pointers (QPointer) \li a dynamic cast that works across library boundaries \endlist @@ -52,14 +28,17 @@ \li \l{Signals & Slots} \endlist - \include module-use.qdocinc using qt module - \quotefile overview/using-qt-core.cmake + \section1 Using the Module - See also the \l {Build with CMake} overview. + \include {module-use.qdocinc} {using the c++ api} + + \section2 Building with CMake + + \include {module-use.qdocinc} {building with cmake} {Core} \section2 Building with qmake - If you use \l qmake to build your projects, Qt6Core is linked by default. + If you use \l qmake to build your projects, Qt Core is linked by default. \section1 Threading and Concurrent Programming @@ -96,35 +75,15 @@ \list \li \l{The Animation Framework} \li \l{JSON Support in Qt} + \li \l{CBOR Support in Qt} + \li \l{Inter-Process Communication} \li \l{How to Create Qt Plugins} \li \l{The Event System} + \li \l{Application Permissions} \endlist - \section1 Module Evolution - - \l{Changes to Qt Core} lists important changes in the module API - and functionality that were done for the Qt 6 series of Qt. - - \section1 Licenses and Attributions - - Qt Core is available under commercial licenses from \l{The Qt Company}. - In addition, it is available under free software licenses: - The \l{GNU Lesser General Public License, version 3}, or - the \l{GNU General Public License, version 2}. - See \l{Qt Licensing} for further details. - - Executables on Windows potentially link - against \l{The QtEntryPoint Library}. This library is available - under commercial licenses and also under the - \l{BSD 3-clause "New" or "Revised" License}. - - Furthermore, Qt Core in Qt \QtVersion may contain third party - modules under following permissive licenses: - - \generatelist{groupsbymodule attributions-qtcore} - \section1 Reference - These are links to the API reference materials. + \list \li \l{Qt Core C++ Classes}{C++ Classes} \list @@ -144,4 +103,26 @@ \endlist \endlist + \section1 Module Evolution + + \l{Changes to Qt Core} lists important changes in the module API + and functionality that were made for the Qt 6 series of Qt. + + \section1 Licenses and Attributions + + Qt Core is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses: + The \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + + Executables on Windows potentially link + against \l{The QtEntryPoint Library}. This library is available + under commercial licenses and also under the + \l{BSD 3-clause "New" or "Revised" License}. + + Furthermore, Qt Core in Qt \QtVersion may contain third party + modules under the following permissive licenses: + + \generatelist{groupsbymodule attributions-qtcore} */ |