diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
| commit | 7702fe86029c771e641a918baa221b9737c0f18e (patch) | |
| tree | 8e0795bc4c701518e1c66922f8e8b0cb359da155 /src/corelib/global/qnamespace.qdoc | |
| parent | 1dd54b5647d33416c39fb41fdab560c815356951 (diff) | |
| parent | 38550c562d918e783bb609622bc8fb46de1bfec4 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index b8588b3f98..404bbfe65a 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1163,8 +1163,8 @@ and Windows) the window will take a modified appearance. This flag is set or cleared by QWidget::setWindowModified(). - \value WA_WindowPropagation Makes a toplevel window inherit font and - palette from its parent. + \value WA_WindowPropagation Makes a toplevel window inherit font, palette + and locale from its parent. \value WA_MacAlwaysShowToolWindow On \macos, show the tool window even when the application is not active. By default, all tool windows are |