diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-12 01:00:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-12 01:00:09 +0100 |
| commit | 6dc1a52b4a3341e5474eab128161212f6d952513 (patch) | |
| tree | 2e8714840ab31f48f279a230c6a01e88d979c7bd /src/corelib/kernel | |
| parent | ffdacff6b0cf068c935e63c0238cbe509f14445c (diff) | |
| parent | f1d2c20a2754894f26e3af3d72699ce01f312799 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic193ccc3e9e3a86e15a002d599c13f35940e1eab
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 1e6b328c75..58ca8279ea 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -194,7 +194,7 @@ QT_BEGIN_NAMESPACE \omitvalue Pointer \value Polish The widget is polished. \value PolishRequest The widget should be polished. - \value QueryWhatsThis The widget should accept the event if it has "What's This?" help. + \value QueryWhatsThis The widget should accept the event if it has "What's This?" help (QHelpEvent). \value ReadOnlyChange Widget's read-only state has changed (since Qt 5.4). \value RequestSoftwareInputPanel A widget wants to open a software input panel (SIP). \value Resize Widget's size changed (QResizeEvent). |