diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-07 13:00:14 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-07 13:00:14 (GMT) |
| commit | f5392a4290e5f7ae2bdf268c1fa8c037e776fdae (patch) | |
| tree | d3cc657639b8784dbc22eae2bae5e58e62db7a2f /doc/src/qnamespace.qdoc | |
| parent | 0044b3c968f5023f502e3574c96d4e4df0de865d (diff) | |
| parent | 2a834d39a69430058df3916392afab064ca941ee (diff) | |
| download | Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.zip Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.tar.gz Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/network/socket/qlocalsocket.cpp
Diffstat (limited to 'doc/src/qnamespace.qdoc')
| -rw-r--r-- | doc/src/qnamespace.qdoc | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index 7e655b6..b691ac7 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -1203,6 +1203,14 @@ on Mac when using Carbon. This attribute has no effect on Cocoa. The attribute is off by default and can be enabled on a per-window basis. + \value WA_AcceptTouchEvents Allows touch events (see QTouchEvent) + to be sent to the widget. Must be set on all widgets that can + handle touch events. Without this attribute set, events from a + touch device will be sent as mouse events. + + \value WA_TouchPadAcceptSingleTouchEvents Allows touchpad single + touch events to be sent to the widget. + \omitvalue WA_SetLayoutDirection \omitvalue WA_InputMethodTransparent \omitvalue WA_WState_CompressKeys @@ -1232,6 +1240,7 @@ \omitvalue WA_X11BypassTransientForHint \omitvalue WA_SetWindowModality \omitvalue WA_WState_WindowOpacitySet + \omitvalue WA_WState_AcceptedTouchBeginEvent */ /*! \typedef Qt::HANDLE @@ -2691,3 +2700,16 @@ \internal */ +/*! + \enum Qt::GestureState + \since 4.6 + + This enum type describes the state of a gesture. + + \omitvalue NoGesture + \value GestureStarted A continuous gesture has started. + \value GestureUpdated A gesture continues. + \value GestureFinished A gesture has finished. + + \sa QGesture +*/ |