diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
| commit | f5da1a9261d64fdac3b4e12082932cb473098c73 (patch) | |
| tree | bf96e4940ef4f66509589cc31095cf1d8e3b3a2c /src/imports/layouts | |
| parent | 0bfcff9d9bd20f3efef6146bd1da6f263b0e24c4 (diff) | |
| parent | dd313c4c5e383827913bbc106f9d19667f2dd149 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quick/items/qquickitemsmodule.cpp
tests/auto/quick/rendernode/tst_rendernode.cpp
Change-Id: I90582df69feb95a4e4aafb0b9793c23714654f19
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}. |