Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	doc/src/development/cmake-manual.qdoc

Change-Id: I915e2fc9a88fc1d54c19048bcb44365e64499d8c

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
 */