diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /src/corelib/global/qnamespace.qdoc | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 89847e4b51..076b006235 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -376,7 +376,7 @@ \omitvalue KeyboardModifierMask \note On \macos, the \c ControlModifier value corresponds to - the Command keys on the Macintosh keyboard, and the \c MetaModifier value + the Command keys on the keyboard, and the \c MetaModifier value corresponds to the Control keys. The \c KeypadModifier value will also be set when an arrow key is pressed as the arrow keys are considered part of the keypad. @@ -394,7 +394,7 @@ supported by Qt. \note On \macos, the \c CTRL value corresponds to - the Command keys on the Macintosh keyboard, and the \c META value + the Command keys on the keyboard, and the \c META value corresponds to the Control keys. \value SHIFT The Shift keys provided on all standard keyboards. @@ -2096,12 +2096,12 @@ We refer to a top-level window that has a parent as a \e secondary window. - \value Sheet Indicates that the window is a Macintosh sheet. Since + \value Sheet Indicates that the window is a sheet on \macos. Since using a sheet implies window modality, the recommended way is to use QWidget::setWindowModality(), or QDialog::open(), instead. - \value Drawer Indicates that the widget is a Macintosh drawer. + \value Drawer Indicates that the widget is a drawer on \macos. \value Popup Indicates that the widget is a pop-up top-level window, i.e. that it is modal, but has a window |