From 5d084e1c94175e7805edd1e21e3c006bc1aa536c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 14 Oct 2016 12:29:25 +0200 Subject: Row/Column/GridLayout: add missing margins properties to documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 52e1044a1a22525b960d9e1d336ac06c4f39e6d5 in qtquickcontrols missed this. Change-Id: Ie104c421e34d4d2a13a88864a279eb65738bd5a8 Reviewed-by: Topi Reiniö --- src/imports/layouts/qquicklinearlayout.cpp | 30 +++--------------------------- src/quick/doc/src/includes/layout.qdocinc | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 src/quick/doc/src/includes/layout.qdocinc (limited to 'src') 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}. diff --git a/src/quick/doc/src/includes/layout.qdocinc b/src/quick/doc/src/includes/layout.qdocinc new file mode 100644 index 0000000000..723fbc515a --- /dev/null +++ b/src/quick/doc/src/includes/layout.qdocinc @@ -0,0 +1,18 @@ +//! [attached-properties] + +\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} +\li \l{Layout::margins}{Layout.margins} +\li \l{Layout::topMargin}{Layout.leftMargin} +\li \l{Layout::rightMargin}{Layout.rightMargin} +\li \l{Layout::topMargin}{Layout.topMargin} +\li \l{Layout::bottomMargin}{Layout.bottomMargin} + +//! [attached-properties] -- cgit v1.2.3