diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
| commit | 2ff13bdf697adff8574c5cea716627c78fb6b5b3 (patch) | |
| tree | f4eac21b3b54f62d9f79714f40d5c9f4804dfc0c /src/imports/layouts | |
| parent | 9d487cd6bf8ad75de19a4c05eb3d2641ce4a5289 (diff) | |
| parent | e13eece273195a9f39d29712a233a8dd00ddf71b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I171c7dbb6a74fe743c2eec63e86e9c0bef7c7dfd
Diffstat (limited to 'src/imports/layouts')
| -rw-r--r-- | src/imports/layouts/qquicklinearlayout.cpp | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp index fdf8479133..7fad395a29 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}. |