diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 11:51:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 11:51:21 (GMT) |
| commit | 2a1bf99770401576f451806b2e2a8c73853ca99b (patch) | |
| tree | 642eaf971a216c3dea6169979de89f7624559dce /src/corelib/global/qnamespace.h | |
| parent | 6165ab0203fa80d31f3488ead7e7f7c088c8668c (diff) | |
| parent | 8e38da7771b40f5585e874a8d12b71225be76503 (diff) | |
| download | Qt-2a1bf99770401576f451806b2e2a8c73853ca99b.zip Qt-2a1bf99770401576f451806b2e2a8c73853ca99b.tar.gz Qt-2a1bf99770401576f451806b2e2a8c73853ca99b.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/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 5 |
1 files changed, 4 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 |