diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-23 11:03:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-23 11:03:46 (GMT) |
| commit | 366af17676a87943c8a7c2380a8819bdd3815878 (patch) | |
| tree | 378efb9fe91abd68be687780276dbcffbf6eb457 /src/gui/kernel | |
| parent | 9619f5e27cbed9b45188112c934733e9f069b8ca (diff) | |
| parent | b7692016f282251002b3e85dfcb5567bd91a12c0 (diff) | |
| download | Qt-366af17676a87943c8a7c2380a8819bdd3815878.zip Qt-366af17676a87943c8a7c2380a8819bdd3815878.tar.gz Qt-366af17676a87943c8a7c2380a8819bdd3815878.tar.bz2 | |
Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel')
| -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 a16d1f8..72eedad 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. |