summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_mac.mm
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-03 13:18:46 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-03 13:18:46 (GMT)
commitccdf924d01cbcb716ed25862561bb94d53ffed1f (patch)
tree6cd8bfb84561faa90c0e61aef424034bec835b08 /src/gui/kernel/qwidget_mac.mm
parent468bbd8fd5c40e29b50e6c38b3f2c3450aad2e67 (diff)
parentb43cbebc5353b7e6b2a3812046a23f327a12c4dc (diff)
downloadQt-ccdf924d01cbcb716ed25862561bb94d53ffed1f.zip
Qt-ccdf924d01cbcb716ed25862561bb94d53ffed1f.tar.gz
Qt-ccdf924d01cbcb716ed25862561bb94d53ffed1f.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qwidget_mac.mm')
-rw-r--r--src/gui/kernel/qwidget_mac.mm8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 250cc35..d1e4230 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -1369,6 +1369,14 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event,
// Set dropWidget to zero, so qt_mac_dnd_event
// doesn't get called a second time below:
dropWidget = 0;
+ } else if (ekind == kEventControlDragLeave) {
+ dropWidget = QDragManager::self()->currentTarget();
+ if (dropWidget) {
+ dropWidget->d_func()->qt_mac_dnd_event(kEventControlDragLeave, drag);
+ }
+ // Set dropWidget to zero, so qt_mac_dnd_event
+ // doesn't get called a second time below:
+ dropWidget = 0;
}
}
}