diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-04 03:30:09 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-04 03:30:09 (GMT) |
commit | 8e9fa6284168d15d73d7779abb784f5ceb299026 (patch) | |
tree | fdc96aea0a301af013bed644d71af03a49a085b3 /src/corelib | |
parent | 4c84020bd1c049ce82e0deb77196829616b91f4a (diff) | |
parent | 6f2d27fd686f5cef0dc52f220ffeeded529d2793 (diff) | |
download | Qt-8e9fa6284168d15d73d7779abb784f5ceb299026.zip Qt-8e9fa6284168d15d73d7779abb784f5ceb299026.tar.gz Qt-8e9fa6284168d15d73d7779abb784f5ceb299026.tar.bz2 |
Merge commit 'origin/4.6' into 4.6-oslo2
Conflicts:
dist/changes-4.6.2
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 3f69b4f..3500b63 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -133,10 +133,10 @@ QT_BEGIN_NAMESPACE \value GrabKeyboard Item gains keyboard grab (QGraphicsItem only). \value GrabMouse Item gains mouse grab (QGraphicsItem only). \value GraphicsSceneContextMenu Context popup menu over a graphics scene (QGraphicsSceneContextMenuEvent). - \value GraphicsSceneDragEnter The cursor enters a graphics scene during a drag and drop operation. - \value GraphicsSceneDragLeave The cursor leaves a graphics scene during a drag and drop operation. - \value GraphicsSceneDragMove A drag and drop operation is in progress over a scene. - \value GraphicsSceneDrop A drag and drop operation is completed over a scene. + \value GraphicsSceneDragEnter The cursor enters a graphics scene during a drag and drop operation (QGraphicsSceneDragDropEvent). + \value GraphicsSceneDragLeave The cursor leaves a graphics scene during a drag and drop operation (QGraphicsSceneDragDropEvent). + \value GraphicsSceneDragMove A drag and drop operation is in progress over a scene (QGraphicsSceneDragDropEvent). + \value GraphicsSceneDrop A drag and drop operation is completed over a scene (QGraphicsSceneDragDropEvent). \value GraphicsSceneHelp The user requests help for a graphics scene (QHelpEvent). \value GraphicsSceneHoverEnter The mouse cursor enters a hover item in a graphics scene (QGraphicsSceneHoverEvent). \value GraphicsSceneHoverLeave The mouse cursor leaves a hover item in a graphics scene (QGraphicsSceneHoverEvent). |