aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@qt.io>2020-11-25 16:18:20 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-30 15:56:56 +0000
commit5be2c864c32e65dcde50d2b8b29f0dfdae0128de (patch)
treed43b693c1c86ab8c0a16744a1bc5e877d134074f
parent7d3829f88e45a1cefaacd1807581da7a0b05f785 (diff)
Doc: Fix QDoc warnings Qt Quick Controls
Non-existing links: - Qt Quick Calendar - Windows Style Wrong link to macOS style Change-Id: I410ef79d71d2ff25eea8cc090516b431e046fc0b Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 01851825f7a823c418cadbaccf78d32fc4440b49) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/imports/controls/doc/src/qt6-changes.qdoc4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-index.qdoc5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/imports/controls/doc/src/qt6-changes.qdoc b/src/imports/controls/doc/src/qt6-changes.qdoc
index 1dede48d..79ac557a 100644
--- a/src/imports/controls/doc/src/qt6-changes.qdoc
+++ b/src/imports/controls/doc/src/qt6-changes.qdoc
@@ -236,8 +236,8 @@
\list
\li Android: \l {Material Style}
\li Linux: \l {Fusion Style}
- \li macOS: \l {macOS Style}
- \li Windows: \l {Windows Style}
+ \li macOS: \macos Style
+ \li Windows: Windows Style
\li All other platforms: \l {Basic Style}
\endlist
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index c5be4285..c2fac700 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -199,7 +199,10 @@
\li \l{Qt Quick}
\li \l{Qt Quick Layouts}
\li \l{Qt Quick Templates 2}
- \li \l{Qt Quick Calendar}
+ \if defined(onlinedocs)
+ \li \l{Qt Quick Calendar}
+ \endif
+ \li Qt Quick Calendar
\li \l{Qt Labs Platform}
\endlist
*/