diff options
| author | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
| commit | dd1a2ad2eb40afd29d418cdf54544d110d39dc25 (patch) | |
| tree | 2d17f5a85f6bc38e1dd80d3ea09800aff0af29b0 /src/corelib/kernel/qcoreevent.cpp | |
| parent | 76bcd00f74b0977b5f6ce12295aae987ea9ad4c1 (diff) | |
| parent | fd30747b5b54a760ca280ad1e75ce87026478f5e (diff) | |
| download | Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.zip Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.gz Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/corelib/kernel/qcoreevent.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index d177b26..d23ea4c 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). @@ -272,7 +272,6 @@ QT_BEGIN_NAMESPACE \omitvalue MacGLClearDrawable \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut - \omitvalue CocoaRequestModal \omitvalue UpdateSoftKeys \omitvalue NativeGesture */ |