diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2020-07-02 17:15:01 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2020-07-03 06:20:33 +0000 |
| commit | 7f436e23acbed756e53801a011fe2c98705c6ecf (patch) | |
| tree | 8d020d82a06e54886822ba563bdc894364b6b947 | |
| parent | ea08857a8be8ad5666a17ced2c855da691a72c16 (diff) | |
Doc: Add "Setting Up Meson" to "All Topics"
To display it correctly in the Help Contents.
Also exclude the topic from the Qt Design Studio Manual build.
Change-Id: I2536ef7214faf12c3e1ff533449db12f87a58aeb
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | doc/qtcreator/src/qtcreator-toc.qdoc | 1 | ||||
| -rw-r--r-- | doc/qtdesignstudio/config/qtdesignstudio.qdocconf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 2fde6213ca..e3b1a0da86 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -256,6 +256,7 @@ \li \l{Setting Up an Autotools Project} \li \l{Setting Up a Generic Project} \li \l{Setting Up Nimble} + \li \l{Setting Up Meson} \endlist \li \l{Using Command Line Options} \li \l{Keyboard Shortcuts} diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index d99c57c609..7c74d2665e 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -44,6 +44,7 @@ excludedirs += ../../qtcreator/examples/accelbubble \ ../../qtcreator/src/ios \ ../../qtcreator/src/linux-mobile \ ../../qtcreator/src/mcu \ + ../../qtcreator/src/meson \ ../../qtcreator/src/overview/creator-only \ ../../qtcreator/src/projects \ ../../qtcreator/src/qnx \ |