aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/layouts
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2016-10-14 12:29:25 +0200
committerMitch Curtis <mitch.curtis@qt.io>2016-10-14 13:15:25 +0000
commit5d084e1c94175e7805edd1e21e3c006bc1aa536c (patch)
tree1f835fe92874811c44b34ab918691f2fc341c5c2 /src/imports/layouts
parent56cf625ad3cf86c4417acf463c4bfb369c7f0916 (diff)
Row/Column/GridLayout: add missing margins properties to documentation
52e1044a1a22525b960d9e1d336ac06c4f39e6d5 in qtquickcontrols missed this. Change-Id: Ie104c421e34d4d2a13a88864a279eb65738bd5a8 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src/imports/layouts')
-rw-r--r--src/imports/layouts/qquicklinearlayout.cpp30
1 files changed, 3 insertions, 27 deletions
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp
index 0b4a1968d7..9aa36e07a8 100644
--- a/src/imports/layouts/qquicklinearlayout.cpp
+++ b/src/imports/layouts/qquicklinearlayout.cpp
@@ -56,15 +56,7 @@
Items in a RowLayout support these attached properties:
\list
- \li \l{Layout::minimumWidth}{Layout.minimumWidth}
- \li \l{Layout::minimumHeight}{Layout.minimumHeight}
- \li \l{Layout::preferredWidth}{Layout.preferredWidth}
- \li \l{Layout::preferredHeight}{Layout.preferredHeight}
- \li \l{Layout::maximumWidth}{Layout.maximumWidth}
- \li \l{Layout::maximumHeight}{Layout.maximumHeight}
- \li \l{Layout::fillWidth}{Layout.fillWidth}
- \li \l{Layout::fillHeight}{Layout.fillHeight}
- \li \l{Layout::alignment}{Layout.alignment}
+ \input layout.qdocinc attached-properties
\endlist
\image rowlayout.png
@@ -118,15 +110,7 @@
Items in a ColumnLayout support these attached properties:
\list
- \li \l{Layout::minimumWidth}{Layout.minimumWidth}
- \li \l{Layout::minimumHeight}{Layout.minimumHeight}
- \li \l{Layout::preferredWidth}{Layout.preferredWidth}
- \li \l{Layout::preferredHeight}{Layout.preferredHeight}
- \li \l{Layout::maximumWidth}{Layout.maximumWidth}
- \li \l{Layout::maximumHeight}{Layout.maximumHeight}
- \li \l{Layout::fillWidth}{Layout.fillWidth}
- \li \l{Layout::fillHeight}{Layout.fillHeight}
- \li \l{Layout::alignment}{Layout.alignment}
+ \input layout.qdocinc attached-properties
\endlist
\image columnlayout.png
@@ -220,15 +204,7 @@
\li \l{Layout::column}{Layout.column}
\li \l{Layout::rowSpan}{Layout.rowSpan}
\li \l{Layout::columnSpan}{Layout.columnSpan}
- \li \l{Layout::minimumWidth}{Layout.minimumWidth}
- \li \l{Layout::minimumHeight}{Layout.minimumHeight}
- \li \l{Layout::preferredWidth}{Layout.preferredWidth}
- \li \l{Layout::preferredHeight}{Layout.preferredHeight}
- \li \l{Layout::maximumWidth}{Layout.maximumWidth}
- \li \l{Layout::maximumHeight}{Layout.maximumHeight}
- \li \l{Layout::fillWidth}{Layout.fillWidth}
- \li \l{Layout::fillHeight}{Layout.fillHeight}
- \li \l{Layout::alignment}{Layout.alignment}
+ \input layout.qdocinc attached-properties
\endlist
Read more about attached properties \l{QML Object Attributes}{here}.