Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

3 files changed, 13 insertions, 5 deletions

diff --git a/src/gui/kernel/qdnd_mac.mm b/src/gui/kernel/qdnd_mac.mm
index b244d84..99399da 100644
--- a/src/gui/kernel/qdnd_mac.mm
+++ b/src/gui/kernel/qdnd_mac.mm
@@ -405,12 +405,12 @@ bool QWidgetPrivate::qt_mac_dnd_event(uint kind, DragRef dragRef)
         SetDragDropAction(dragRef, qt_mac_dnd_map_qt_actions(qDEEvent.dropAction()));
         
         if (!qDEEvent.isAccepted())
-            // The widget is simply not interrested in this
+            // The widget is simply not interested in this
             // drag. So tell carbon this by returning 'false'. We will then
             // not receive any further move, drop or leave events for this widget.
             return false;
         else {
-            // Documentation states that a drag move event is sendt immidiatly after
+            // Documentation states that a drag move event is sent immediately after
             // a drag enter event. So we do that. This will honor widgets overriding
             // 'dragMoveEvent' only, and not 'dragEnterEvent' 
             QDragMoveEvent qDMEvent(q->mapFromGlobal(QPoint(mouse.h, mouse.v)), qtAllowed, dropdata,
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;
                     }
                 }
             }
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp
index 3ddde1b..659331f 100644
--- a/src/gui/kernel/qx11embed_x11.cpp
+++ b/src/gui/kernel/qx11embed_x11.cpp
@@ -826,7 +826,7 @@ bool QX11EmbedWidget::x11Event(XEvent *event)
                                    &actual_format_return, &nitems_return,
                                    &bytes_after_return, &prop_return) == Success) {
                 if (nitems_return > 1) {
-                    if (((int * )prop_return)[1] & XEMBED_MAPPED) {
+                    if (((long * )prop_return)[1] & XEMBED_MAPPED) {
                         XMapWindow(x11Info().display(), internalWinId());
                     } else {
                         XUnmapWindow(x11Info().display(), internalWinId());
@@ -1670,9 +1670,9 @@ void QX11EmbedContainerPrivate::acceptClient(WId window)
 	    // Clients with the _XEMBED_INFO property are XEMBED clients.
 	    clientIsXEmbed = true;
 
-	    unsigned int *p = (unsigned int *)prop_return;
+	    long *p = (long *)prop_return;
 	    if (nitems_return >= 2)
-		clientversion = p[0];
+		clientversion = (unsigned int)p[0];
 	}
 
 	XFree(prop_return);