summaryrefslogtreecommitdiff
path: root/src/controls/doc
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@digia.com>2013-03-21 14:24:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-10 12:57:51 +0200
commit6d70146b6d295b7704df6b3afe25c2550c6d9335 (patch)
tree462e9150c65a1182af2120a4f1382905e97ee993 /src/controls/doc
parent628d3eeb4b91ef0159a87f3add5d97a77af5fec6 (diff)
downloadqtquickcontrols-6d70146b6d295b7704df6b3afe25c2550c6d9335.tar.gz
Add documentation to QtQuick.Layouts
Change-Id: Ia220ccfd534ca089367c4ee954e081770784524c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/controls/doc')
-rw-r--r--src/controls/doc/qtquickcontrols.qdocconf2
-rw-r--r--src/controls/doc/src/qtquickcontrols-index.qdoc5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index 943c5132..d6268b33 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -29,7 +29,7 @@ qhp.qtquickcontrols.subprojects.styleqmltypes.indexTitle = Qt Quick Controls Sty
qhp.qtquickcontrols.subprojects.styleqmltypes.selectors = class fake:qmlclass
qhp.qtquickcontrols.subprojects.styleqmltypes.sortPages = true
-depends = qtqml qtquick qtwidgets qtdoc
+depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts
exampledirs += ../../../examples/
diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc
index 90f5fcce..56b5b0d6 100644
--- a/src/controls/doc/src/qtquickcontrols-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-index.qdoc
@@ -59,6 +59,11 @@
Controls are typically items that are used to present or receive input from the user.
\annotatedlist controls
+ \section1 Layouts
+ \l{Qt Quick Layouts}{Layouts} can be used to have dynamic user interfaces where the UI
+ adapts to the available geometry.
+ \annotatedlist layouts
+
\section1 Related information
\section2 Guides