summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/src/qtcore-index.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/doc/src/qtcore-index.qdoc')
-rw-r--r--src/corelib/doc/src/qtcore-index.qdoc87
1 files changed, 37 insertions, 50 deletions
diff --git a/src/corelib/doc/src/qtcore-index.qdoc b/src/corelib/doc/src/qtcore-index.qdoc
index c74f173562..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,14 +75,38 @@
\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 Reference
+
+ \list
+ \li \l{Qt Core C++ Classes}{C++ Classes}
+ \list
+ \li \l{Animation Framework}{Animation Classes}
+ \li \l{Threading Classes}
+ \li \l{Container Classes}
+ \li \l{Plugin Classes}
+ \li \l{Implicitly Shared Classes}
+ \li \l{Input/Output and Networking}{Input/Output Classes}
+ \li \l{Event Classes}
+ \endlist
+ \li CMake API
+ \list
+ \li \l{CMake Commands in Qt6 Core}{CMake Commands}
+ \li \l{CMake Variables in Qt6 Core}{CMake Variables}
+ \li \l{CMake Target Properties in Qt6 Core}{CMake Target Properties}
+ \endlist
\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.
+ and functionality that were made for the Qt 6 series of Qt.
\section1 Licenses and Attributions
@@ -119,23 +122,7 @@
\l{BSD 3-clause "New" or "Revised" License}.
Furthermore, Qt Core in Qt \QtVersion may contain third party
- modules under following permissive licenses:
+ modules under the 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
- \li \l{Animation Framework}{Animation Classes}
- \li \l{Threading Classes}
- \li \l{Container Classes}
- \li \l{Plugin Classes}
- \li \l{Implicitly Shared Classes}
- \li \l{Input/Output and Networking}{Input/Output Classes}
- \li \l{Event Classes}
- \endlist
- \endlist
-
*/