summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2014-06-04 18:15:06 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-06 12:58:11 +0200
commit95d57359601d7ec92fd1bcf2029f4273922a0003 (patch)
tree6d1747e4385371c2bb79f974489c0e71679cdf1b
parent9dd06b0372b61300fe068a3ebe4c53e4b73c0fe8 (diff)
downloadqtdoc-95d57359601d7ec92fd1bcf2029f4273922a0003.tar.gz
Doc: Updated "Layout Examples" page.
-added link from "Qt Examples and Tutorials" -edited paragraphs and links Task-number: QTBUG-33597 Change-Id: I06ed1234e16be523bb70a13960e1e5a609882a2e Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--doc/src/examples.qdoc1
-rw-r--r--doc/src/getting-started/examples.qdoc21
2 files changed, 12 insertions, 10 deletions
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 70a0352e..50557ccf 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -106,6 +106,7 @@
\li \l{modelview.html}{Model-View}
\li \l{Item Views Examples}
\li \l{Main Window Examples}
+ \li \l{Layout Examples}
\endlist
\list
\li \l{Qt Widgets Examples}{See more}
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 52878139..344a45c2 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -39,21 +39,22 @@
\image layout-examples.png
- Qt uses a layout-based approach to widget management. Widgets are arranged in
- the optimal positions in windows based on simple layout rules, leading to a
- consistent look and feel.
+ Qt uses a layout-based approach to widget management. Widgets are arranged
+ in the optimal positions in windows based on simple layout rules, leading to
+ a consistent look and feel. Custom layouts provide more control over the
+ positions and sizes of child widgets.
- Custom layouts can be used to provide more control over the positions and
- sizes of child widgets.
+ These \l{Qt Examples and Tutorials}{Qt Examples} demonstrate various
+ ways of setting widgets in layouts.
\list
- \li \l{layouts/basiclayouts}{Basic Layouts}\raisedaster
- \li \l{layouts/borderlayout}{Border Layout}
- \li \l{layouts/dynamiclayouts}{Dynamic Layouts}
- \li \l{layouts/flowlayout}{Flow Layout}
+ \li \l{Basic Layouts Example}{Basic Layouts}
+ \li \l{Border Layout Example}{Border Layout}
+ \li \l{Dynamic Layouts Example}{Dynamic Layouts}
+ \li \l{Flow Layout Example}{Flow Layout}
\endlist
- Examples marked with an asterisk (*) are fully documented.
+ \sa {Layout Management}
*/
/*!