diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:50:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:52:26 +0200 |
| commit | 86699cbccaa044adfd36a14453de8e5c0cefc226 (patch) | |
| tree | ea5662ef8746842a765612f45a9f48f25b9c5d6a /src/quick/doc/src | |
| parent | 2bcfb322df727abf96022830077d4ae8b30f644d (diff) | |
| parent | 10095542d16fc9f5b2c585abf72fe00be9debff3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.h
src/quick/items/qquickwindow.cpp
Change-Id: I551404e1558d56c0b0626346ad1c86406bff0ec7
Diffstat (limited to 'src/quick/doc/src')
| -rw-r--r-- | src/quick/doc/src/includes/item.qdocinc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/quick/doc/src/includes/item.qdocinc b/src/quick/doc/src/includes/item.qdocinc index 12472cb928..4cb2652bbf 100644 --- a/src/quick/doc/src/includes/item.qdocinc +++ b/src/quick/doc/src/includes/item.qdocinc @@ -4,3 +4,12 @@ The following properties of the item are used in the mapping: \l x, \l y, \l scale, \l rotation, \l transformOrigin, and \l [QML]{Item::}{transform}. //! [mapping] + + +//! [accepting-events] + +The event is accepted by default, so it is not necessary to explicitly +accept the event if you reimplement this function. If you don't accept the +event, call \c event->ignore(). + +//! [accepting-events] |