diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 15:09:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 15:09:53 (GMT) |
| commit | e029b5b7bf8cb8815e33a1e08b6a609dafa25f52 (patch) | |
| tree | 713865b357d7087d3c06bc34c6babf2ecdcc1eca /src/corelib/kernel | |
| parent | a9fa8187b1a7efe343e0bf2722cde5c0ef5fa77e (diff) | |
| parent | 05a1573eddc6dc404631c9d16474c81aa4cea569 (diff) | |
| download | Qt-e029b5b7bf8cb8815e33a1e08b6a609dafa25f52.zip Qt-e029b5b7bf8cb8815e33a1e08b6a609dafa25f52.tar.gz Qt-e029b5b7bf8cb8815e33a1e08b6a609dafa25f52.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed QFileInfo::absolutePath() warning when running "qmake -project"
QTcpServer: Clarify thread affinity of incoming QTcpSocket
Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.
Updated my changelog entry
QNAM HTTP: Fix bug related to re-sending a request
Adding my changes.
Remove erroneous warning in QFileInfo::absolutePath()
Diffstat (limited to 'src/corelib/kernel')
| -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). |