diff options
| author | Andy Shaw <andy.shaw@nokia.com> | 2010-07-22 14:27:26 (GMT) |
|---|---|---|
| committer | Andy Shaw <andy.shaw@nokia.com> | 2010-07-22 14:27:26 (GMT) |
| commit | 62b2022f1e3188b11cf16770a92824eeb2ad70a3 (patch) | |
| tree | a5d3b9eb997e4f8cc99fd145a8716a1fca0ad368 | |
| parent | 7c086ff4e735f699451124b0fdbc380480dd418b (diff) | |
| parent | 88410105978d5fb4344207cd5d296057ced0f27d (diff) | |
| download | Qt-62b2022f1e3188b11cf16770a92824eeb2ad70a3.zip Qt-62b2022f1e3188b11cf16770a92824eeb2ad70a3.tar.gz Qt-62b2022f1e3188b11cf16770a92824eeb2ad70a3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 1935531..a552ce7 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -390,7 +390,10 @@ static int qCocoaViewCount = 0; if (QDragManager::self()->source()) mimeData = QDragManager::self()->dragPrivate()->data; QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); - qDMEvent.setDropAction(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction); + if (QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction != Qt::IgnoreAction + && QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).buttons == qDMEvent.mouseButtons() + && QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).modifiers == qDMEvent.keyboardModifiers()) + qDMEvent.setDropAction(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction); qDMEvent.accept(); QApplication::sendEvent(qwidget, &qDMEvent); |