diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:27:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:29:14 +0200 |
| commit | f82e5085169876e0ec7c1b744d021b068c281cfe (patch) | |
| tree | a870e1f68ce62818a0793c4c78a67971e841e676 /src/corelib/global/qnamespace.qdoc | |
| parent | f74d4fb1dacc682e2e6f4a44e4240f642a2c3b70 (diff) | |
| parent | ee47999333dde1d38b73d04e142e05f06f8c56ed (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_common.prf
src/corelib/tools/qstring.cpp
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 66a7a1e6b5..2fcc744092 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1334,7 +1334,14 @@ \omitvalue WA_WState_WindowOpacitySet \omitvalue WA_WState_AcceptedTouchBeginEvent \omitvalue WA_MacNoShadow - \omitvalue WA_ContentsMarginsRespectsSafeArea + \value WA_ContentsMarginsRespectsSafeArea A QWidget respects the safe + area margins of a window by incorporating the margins into its contents' + margins by default. This means, that a QLayout will use the content area + of a widget for its layout, unless the Qt::WA_LayoutOnEntireRect attribute + is set. This along with a contents margin of 0 can be used on the actual + layout, to allow for example a background image to underlay the status bar and other + system areas on an iOS device, while still allowing child widgets of + that background to be inset based on the safe area. */ /*! \typedef Qt::HANDLE |