Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
	src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
	src/gui/text/qfont_s60.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index f5a93d9..8c194cc 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -347,7 +347,7 @@ QT_END_NAMESPACE
     QWidget *qwidget = QApplication::widgetAt(globalPoint);
     *currentDragTarget() = qwidget;
     if (!qwidget)
-        return [super draggingEntered:sender];
+        return NSDragOperationNone;
     if (qwidget->testAttribute(Qt::WA_DropSiteRegistered) == false)
         return NSDragOperationNone;
 
@@ -413,7 +413,7 @@ QT_END_NAMESPACE
 
     QWidget *qwidget = QApplication::widgetAt(globalPoint);
     if (!qwidget)
-        return [super draggingEntered:sender];
+        return NSDragOperationNone;
 
     // First, check if the widget under the mouse has changed since the
     // last drag move events. If so, we need to change target, and dispatch
@@ -500,7 +500,7 @@ QT_END_NAMESPACE
 
     QWidget *qwidget = *currentDragTarget();
     if (!qwidget)
-        return [super draggingExited:sender];
+        return;
 
     if (dropData) {
         QDragLeaveEvent de;