diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:00:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:00:42 +0200 |
| commit | fd2d9de51e324936a1e0d809e3f49c245a10d016 (patch) | |
| tree | 57587870ba4aac8ae3625eb438cad78016a65ee0 /src/widgets/doc/src | |
| parent | 135aa77021519ef833c807d49d4fe3428ab970e5 (diff) | |
| parent | 3f8e754f07db944dc74d84cc1c24d3e11677ad09 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Icaabf08f9af539ddf844d96bc9c3a2d09408ba8a
Diffstat (limited to 'src/widgets/doc/src')
| -rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/layout.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc index e507d66451..65569a9cd2 100644 --- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc @@ -220,7 +220,7 @@ When you make your own widget class, you should also communicate its layout properties. If the widget uses one of Qt's layouts, this is already taken - care of. If the widget does not have any child widgets, or uses manual + care of. If the widget does not have any child widgets, or uses a manual layout, you can change the behavior of the widget using any or all of the following mechanisms: |