2 files changed, 21 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h
index d831612c22..6779bda491 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h
@@ -42,8 +42,9 @@
 #define QCOCOASYSTEMTRAYICON_P_H
 
 #include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>
 
-#ifndef QT_NO_SYSTEMTRAYICON
+#if QT_CONFIG(systemtrayicon)
 
 #include "QtCore/qstring.h"
 #include "QtGui/qpa/qplatformsystemtrayicon.h"
diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
index 002cb3279e..37e972dba9 100644
--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
@@ -293,7 +293,26 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
     QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
     nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
 
+    // Qt starts drag-and-drop on a mouse button press event. Cococa in
+    // this case won't send the matching release event, so we have to
+    // synthesize it here.
     m_buttons = currentlyPressedMouseButtons();
+    const auto modifiers = [QNSView convertKeyModifiers:NSApp.currentEvent.modifierFlags];
+
+    NSPoint windowPoint = [self.window convertRectFromScreen:NSMakeRect(screenPoint.x, screenPoint.y, 1, 1)].origin;
+    NSPoint nsViewPoint = [self convertPoint: windowPoint fromView: nil];
+
+    QPoint qtWindowPoint(nsViewPoint.x, nsViewPoint.y);
+    QPoint qtScreenPoint = QCocoaScreen::mapFromNative(screenPoint).toPoint();
+
+    QWindowSystemInterface::handleMouseEvent(
+        target,
+        mapWindowCoordinates(m_platformWindow->window(), target, qtWindowPoint),
+        qtScreenPoint,
+        m_buttons,
+        Qt::NoButton,
+        QEvent::MouseButtonRelease,
+        modifiers);
 
     qCDebug(lcQpaMouse) << "Drag session" << session << "ended, with" << m_buttons;
 }