diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 03:45:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 03:45:49 (GMT) |
| commit | 3abc322eb6834aa61cc77d73dbd17c4389accb00 (patch) | |
| tree | 7fc588eb11bcf8b714e2b9dd845c504c3c19e5d2 /src/gui/kernel/qcursor.cpp | |
| parent | fe239b32550e83e8a42617457adca8d7922ff92f (diff) | |
| parent | 9ffdfa58b3ad2ed4100a7d223a85399b72c6deb7 (diff) | |
| download | Qt-3abc322eb6834aa61cc77d73dbd17c4389accb00.zip Qt-3abc322eb6834aa61cc77d73dbd17c4389accb00.tar.gz Qt-3abc322eb6834aa61cc77d73dbd17c4389accb00.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:
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/gui/kernel/qcursor.cpp')
| -rw-r--r-- | src/gui/kernel/qcursor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index 0f0470c..f38e4f5 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -141,6 +141,12 @@ QT_BEGIN_NAMESPACE \o Qt::WhatsThisCursor \o \c whats_this \o \inlineimage cursor-closedhand.png \o Qt::ClosedHandCursor \o \c closedhand + \row \o + \o Qt::DragMoveCursor \o \c dnd-move or \c move + \o + \o Qt::DragCopyCursor \o \c dnd-copy or \c copy + \row \o + \o Qt::DragLinkCursor \o \c dnd-link or \c link \endtable \sa QWidget, {fowler}{GUI Design Handbook: Cursors} |