diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-11-20 10:51:55 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-23 12:08:10 (GMT) |
| commit | 3358806d229588607f2749e6b22c53c3248cbfcd (patch) | |
| tree | 0114ed70aeded3ea0e06547263b09d11e0e6a0af | |
| parent | e0f146f2048a6963cd57d5473ff6501e25ddfcd9 (diff) | |
| download | Qt-3358806d229588607f2749e6b22c53c3248cbfcd.zip Qt-3358806d229588607f2749e6b22c53c3248cbfcd.tar.gz Qt-3358806d229588607f2749e6b22c53c3248cbfcd.tar.bz2 | |
Incorrect DropAction returned by QDrag::exec() on Cocoa.
The action performed by the latest drag and drop operation is stored in
the global DnDParams structure. The QDrag::exec() return value has to be
fetcted from this global variable instead of the temporary copy on stack.
Commit 0d231c32cc7670d356d486b13648cb5bd471ffef broke this.
Task-number: QTBUG-6001
Reviewed-by: Denis
(cherry picked from commit a222302ca45e33306dacae0aa16a572c13abc483)
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 7bd8128..d02cf94 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -1451,7 +1451,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) [image release]; dragPrivate()->executed_action = Qt::IgnoreAction; object = 0; - Qt::DropAction performedAction(qt_mac_mapNSDragOperation(dndParams.performedAction)); + Qt::DropAction performedAction(qt_mac_mapNSDragOperation(qMacDnDParams()->performedAction)); // do post drag processing, if required. if(performedAction != Qt::IgnoreAction) { // check if the receiver points us to a file location. |