diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 00:15:12 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 00:15:12 (GMT) |
commit | 4a5e8e026bed24d451e2d36f490f42a17ed74b47 (patch) | |
tree | 642eaf971a216c3dea6169979de89f7624559dce /src/corelib/global | |
parent | 6165ab0203fa80d31f3488ead7e7f7c088c8668c (diff) | |
parent | 2a1bf99770401576f451806b2e2a8c73853ca99b (diff) | |
download | Qt-4a5e8e026bed24d451e2d36f490f42a17ed74b47.zip Qt-4a5e8e026bed24d451e2d36f490f42a17ed74b47.tar.gz Qt-4a5e8e026bed24d451e2d36f490f42a17ed74b47.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile fix for embedded.
Revised fix for system tray popup activation
Fixed draggabletext example.
Added new mouse cursor types.
Doc: more \since 4.7
Doc: add \since 4.7 to new functions.
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qnamespace.h | 5 | ||||
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 177bee4..35ff8e7 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1235,7 +1235,10 @@ public: BusyCursor, OpenHandCursor, ClosedHandCursor, - LastCursor = ClosedHandCursor, + DragCopyCursor, + DragMoveCursor, + DragLinkCursor, + LastCursor = DragLinkCursor, BitmapCursor = 24, CustomCursor = 25 diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 6627c76..3d49d60 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2508,6 +2508,15 @@ operations that allow the user to interact with the application while they are performed in the background. + \value DragMoveCursor + A cursor that is usually used when dragging an item. + \value DragCopyCursor + A cursor that is usually used when dragging an item + to copy it. + \value DragLinkCursor + A cursor that is usually used when dragging an item + to make a link to it. + \value BitmapCursor \omitvalue LastCursor \omitvalue CustomCursor |