diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 11:08:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:19:57 +0200 |
| commit | 28628a5d5e6c55512759ceafc644aa31e444b781 (patch) | |
| tree | 221d1ab0995afe0d441f1ddb433aee985f6d41ea /src/corelib/doc/src | |
| parent | cbb2ba23e203374132e4b134b1c8f1a3626d2378 (diff) | |
| parent | 686c44a69b13f6e884dd2b6d9991f4cd94597c5a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/eglfs/qeglfshooks.cpp
Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2
Diffstat (limited to 'src/corelib/doc/src')
| -rw-r--r-- | src/corelib/doc/src/eventsandfilters.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/doc/src/eventsandfilters.qdoc b/src/corelib/doc/src/eventsandfilters.qdoc index 4e914d17cc..947a24f4e5 100644 --- a/src/corelib/doc/src/eventsandfilters.qdoc +++ b/src/corelib/doc/src/eventsandfilters.qdoc @@ -80,7 +80,7 @@ \section1 Event Types - Most events types have special classes, notably QResizeEvent, + Most event types have special classes, notably QResizeEvent, QPaintEvent, QMouseEvent, QKeyEvent, and QCloseEvent. Each class subclasses QEvent and adds event-specific functions. For example, QResizeEvent adds \l{QResizeEvent::}{size()} and |