aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@qt.io>2019-10-01 12:32:44 +0200
committerNico Vertriest <nico.vertriest@qt.io>2019-10-02 11:54:55 +0200
commitd0e88f82e07d7a29572d51cecf950d3844408056 (patch)
treeff8fab3f487326a8b98d70aa37ff950f7a67fc7c
parent0ca9f69389daa5b8f6ee2aa6d783335cb5a5b756 (diff)
Doc: Correct reference to StackView
- erroneous link to Controls1 - put qtquickcontrols before qtquickcontrols1 in depends statement Task-number: QTBUG-78799 Change-Id: I8107d9f23660e37c742a588b0efc38ac336babeb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/imports/layouts/qquickstacklayout.cpp2
-rw-r--r--src/quick/doc/qtquick.qdocconf2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/layouts/qquickstacklayout.cpp b/src/imports/layouts/qquickstacklayout.cpp
index 116e162aa9..4c1d611409 100644
--- a/src/imports/layouts/qquickstacklayout.cpp
+++ b/src/imports/layouts/qquickstacklayout.cpp
@@ -94,7 +94,7 @@
\sa ColumnLayout
\sa GridLayout
\sa RowLayout
- \sa StackView
+ \sa {QtQuick.Controls::StackView}{StackView}
*/
QT_BEGIN_NAMESPACE
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 13746b13de..56f1f20b3e 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -38,7 +38,7 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example
tagfile = ../../../doc/qtquick/qtquick.tags
-depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols1 qtquickcontrols qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns
+depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols qtquickcontrols1 qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns
headerdirs += ..\
../../quickwidgets