summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/src/qtcore-index.qdoc
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-04-01 15:49:47 +0200
committerKai Koehne <kai.koehne@qt.io>2019-05-07 07:46:21 +0000
commitc57520e491f420dc83d44ce5382c403192ce4836 (patch)
tree7958ba1eba1b01b7c6de66f87bc4b921eb288759 /src/corelib/doc/src/qtcore-index.qdoc
parent43763e279644cdd2a52d770b9aeda4d485caaa76 (diff)
Document how to use CMake on Qt Core, Qt GUI's central pages
Add documentation on how to use a module from CMake, alongside the existing documentation about qmake. Separate generic info from module-specific examples, to make it possible to use one include file in all modules. While at it, also remove the mentioning of the central include; it is not something we should actively advocate anymore. Instead, the documentation of every class gives the correct include to use. Task-number: QTBUG-73058 Change-Id: I6b3c0e5ea218dd9c06a491c8fb799a7fcf42dd92 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/corelib/doc/src/qtcore-index.qdoc')
-rw-r--r--src/corelib/doc/src/qtcore-index.qdoc21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/corelib/doc/src/qtcore-index.qdoc b/src/corelib/doc/src/qtcore-index.qdoc
index 04af0e9416..40a6584af0 100644
--- a/src/corelib/doc/src/qtcore-index.qdoc
+++ b/src/corelib/doc/src/qtcore-index.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -31,17 +31,9 @@
\brief The Qt Core module is part of Qt's essential modules.
- \section1 Getting Started
- All other Qt modules rely on this module. To include the
- definitions of the module's classes, use the following directive:
-
- \snippet code/doc_src_qtcore.cpp 0
-
- If you use \l qmake to build your projects, Qt Core is included by default.
-
\section1 Core Functionalities
- Qt adds these features to C++:
+ Qt Core adds these features to C++:
\list
\li a very powerful mechanism for seamless object communication called
@@ -61,6 +53,15 @@
\li \l{Signals & Slots}
\endlist
+ \include module-use.qdocinc using qt module
+ \quotefile overview/using-qt-core.cmake
+
+ See also the \l[QtDoc]{Building with CMake} overview.
+
+ \section2 Building with qmake
+
+ If you use \l qmake to build your projects, Qt5Core is linked by default.
+
\section1 Threading and Concurrent Programming
Qt provides thread support in the form of platform-independent \l{Threading