diff options
| author | James Turner <james.turner@kdab.com> | 2012-06-20 15:01:56 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 18:00:41 +0200 |
| commit | 76b1df303237c1bd37e4b822f44686980e66b73f (patch) | |
| tree | 46dcd5ef12228319ec9ee394dde08b977b7a35ea /src/gui/kernel/qplatformdrag.h | |
| parent | a8fb38f230da9a7afc3dbace6fa45c33dc58b4a6 (diff) | |
Native drag implementation on Mac
Create a native implementation of QCocoaDrag, using the 10.6 (and earlier) Cocoa
dragging API. This matches the implementation in Qt4 closely for the moment.
In the future it may be desirable to create an alternative implementation using
the new (non-blocking) drag API introduced in 10.7, but that will require deeper
changes to the mime-data handling.
This changes makes one more method on QPlatformDrag virtual, since the
Cocoa behaviour diverges from the base version: ::defaultAction is customised.
Change-Id: I1843293a62b2b4973a07b5e75ea3c312dc064018
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/gui/kernel/qplatformdrag.h')
| -rw-r--r-- | src/gui/kernel/qplatformdrag.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformdrag.h b/src/gui/kernel/qplatformdrag.h index 10d539b7c2..3920704ebc 100644 --- a/src/gui/kernel/qplatformdrag.h +++ b/src/gui/kernel/qplatformdrag.h @@ -104,7 +104,7 @@ public: virtual Qt::DropAction drag(QDrag *m_drag) = 0; void updateAction(Qt::DropAction action); - Qt::DropAction defaultAction(Qt::DropActions possibleActions, Qt::KeyboardModifiers modifiers) const; + virtual Qt::DropAction defaultAction(Qt::DropActions possibleActions, Qt::KeyboardModifiers modifiers) const; static QPixmap defaultPixmap(); |