summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-27 09:16:56 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-27 09:17:14 +0200
commit761b71bd20524bc1e495508a52c38a0bc6679a06 (patch)
treedf2748fb11234c9b0dfb82828ce8d76459d185db /doc
parent800941df899a4418d4ac6cebbcc31a40120167bc (diff)
parent14aa1f7d6ffea29647557f98e654355782f55e66 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'doc')
-rw-r--r--doc/global/externalsites/external-resources.qdoc10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index 01c6939dca..1c3d37c199 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -72,6 +72,16 @@
*/
/*!
+ \externalpage https://cmake.org/cmake/help/latest/manual/cmake-qt.7.html#autorcc
+ \title CMake AUTORCC Documentation
+*/
+
+/*!
+ \externalpage https://cmake.org/cmake/help/latest/manual/cmake-qt.7.html#autouic
+ \title CMake AUTOUIC Documentation
+*/
+
+/*!
\externalpage https://cmake.org/cmake/help/latest/prop_tgt/LOCATION.html
\title CMake LOCATION Documentation
*/