summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-05 09:31:37 +0200
committerLiang Qi <liang.qi@qt.io>2019-08-05 11:24:53 +0000
commit2b710e89fa7a1ce71bd98185580d9498af652a6e (patch)
tree50069fb0fd8f2a975d7ae54e7d2deda473e12916
parent2069724dbd28c3547749d175d1a36d7752db7742 (diff)
parent9fe893d7468d9015bc4cf58a1f415e59c34a9753 (diff)
downloadqtdoc-2b710e89fa7a1ce71bd98185580d9498af652a6e.tar.gz
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r--doc/src/development/cmake-manual.qdoc20
1 files changed, 18 insertions, 2 deletions
diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc
index 173ed050..0d957b95 100644
--- a/doc/src/development/cmake-manual.qdoc
+++ b/doc/src/development/cmake-manual.qdoc
@@ -105,8 +105,9 @@
\page cmake-variable-reference.html
\title CMake Variable Reference
\brief Provides a complete reference for CMake variables implemented in Qt.
+ \contentspage Build with CMake
\nextpage CMake Command Reference
- \previouspage CMake Manual
+ \previouspage Build with CMake
\section1 Module variables
@@ -174,8 +175,23 @@
\page cmake-command-reference.html
\title CMake Command Reference
\brief Provides a complete reference for CMake commands implemented in Qt.
- \contentspage CMake Manual
+ \contentspage Build with CMake
\previouspage CMake Variable Reference
+ \section2 Qt5::Core
+
+ \annotatedlist cmake-macros-qtcore
+
+ \section2 Qt5::Widgets
+
+ \annotatedlist cmake-macros-qtwidgets
+
+ \section2 Qt5::DBus
+
+ \annotatedlist cmake-commands-qtdbus
+
+ \section2 Qt5::LinguistTools
+
+ \annotatedlist cmake-macros-qtlinguisttools
*/