diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 01:00:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-17 10:19:22 +0200 |
| commit | 1783fca89768a9d503d886673643dc4542ec467f (patch) | |
| tree | 5055f39393017219e448ade71b3842896c4679c5 /src/corelib/global/qnamespace.qdoc | |
| parent | b82648bd59256abb8e7084e0424a1f8a6a034c34 (diff) | |
| parent | 435d1d53bd61491010dbb2130a27e35cd9798965 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbintegration.cpp
Conflicts git missed:
src/plugins/platforms/qnx/qqnxglcontext.cpp
Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index de0c6feeb6..6bd72ff059 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1366,7 +1366,10 @@ \value Key_Pause The Pause/Break key (\b Note: Not related to pausing media) \value Key_Print \value Key_SysReq - \value Key_Clear + \value Key_Clear Corresponds to the \b Clear key on selected Apple + keyboard models. On other systems it is commonly mapped + to the numeric keypad key \b 5, when \b {Num Lock} is + \c off. \value Key_Home \value Key_End \value Key_Left |