diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /src/gui/kernel/qevent.cpp | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index adf5f66679..3e3db64d6f 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -1146,12 +1146,13 @@ QMoveEvent::~QMoveEvent() /*! \class QExposeEvent + \since 5.0 \brief The QExposeEvent class contains event parameters for expose events. \ingroup events - Expose events are sent to widgets when an area of the widget is invalidated - and needs to be flushed from the backing store. + Expose events are sent to windows when an area of the window is invalidated + or window visibility in the windowing system changes. The event handler QWindow::exposeEvent() receives expose events. */ @@ -1761,9 +1762,11 @@ void QInputMethodEvent::setTentativeCommitString(const QString &tentativeCommitS \sa setTentativeCommitString() */ -/*! \class QInputMethodQueryEvent +/*! + \class QInputMethodQueryEvent + \since 5.0 - This event is sent by the input context to input objects. + \brief This event is sent by the input context to input objects. It is used by the input method to query a set of properties of the object to be @@ -3375,9 +3378,10 @@ QWindowStateChangeEvent::~QWindowStateChangeEvent() gestures. Whenever such a decision is made (the gesture is recognized), the clients will be notified with a QEvent::TouchCancel event so they can update their state accordingly. - The touchPoints() function returns a list of all touch points contained in the event. - Information about each touch point can be retrieved using the QTouchEvent::TouchPoint class. - The Qt::TouchPointState enum describes the different states that a touch point may have. + The touchPoints() function returns a list of all touch points contained in the event. Note that + this list may be empty, for example in case of a QEvent::TouchCancel event. Information about + each touch point can be retrieved using the QTouchEvent::TouchPoint class. The + Qt::TouchPointState enum describes the different states that a touch point may have. \section1 Event Delivery and Propagation |