diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:00:04 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:00:04 +0100 |
| commit | 03097d5038fe6331df97182a38fac3a9a84fe195 (patch) | |
| tree | 928675991970423a6b06a8bcf5aeb79b43d2710e /src/imports | |
| parent | fee0fcfef08a05ed4ba9369d2352c876b514d69c (diff) | |
| parent | 407e2769c7b7909fdb2979090e71fa636f109a04 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I69c3e6610ff590d9c18f386fc17ed2e429b58d26
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/layouts/qquicklayout.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp index d90eae5f80..450cf26cea 100644 --- a/src/imports/layouts/qquicklayout.cpp +++ b/src/imports/layouts/qquicklayout.cpp @@ -411,7 +411,11 @@ void QQuickLayoutAttached::setColumn(int column) This property allows you to specify the alignment of an item within the cell(s) it occupies. - The default value is \c 0, which means it will be \c{Qt.AlignVCenter | Qt.AlignLeft} + The default value is \c 0, which means it will be \c{Qt.AlignVCenter | Qt.AlignLeft}. + These defaults also apply if only a horizontal or vertical flag is specified: + if only a horizontal flag is specified, the default vertical flag will be + \c Qt.AlignVCenter, and if only a vertical flag is specified, the default + horizontal flag will be \c Qt.AlignLeft. A valid alignment is a combination of the following flags: \list |