1 files changed, 16 insertions, 18 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index ec46dda38a..3a9f5a8794 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include <AppKit/AppKit.h>
+#include <UniformTypeIdentifiers/UTCoreTypes.h>
 
 #include "qcocoadrag.h"
 #include "qmacclipboard.h"
 #include "qcocoahelpers.h"
 #include <QtGui/private/qcoregraphics_p.h>
 #include <QtGui/qutimimeconverter.h>
-#include <QtCore/qsysinfo.h>
 #include <QtCore/private/qcore_mac_p.h>
 
 #include <vector>
@@ -98,7 +98,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
     m_drag = o;
     m_executed_drop_action = Qt::IgnoreAction;
 
-    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QUtiMimeConverter::HandlerScope::DnD);
+    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QUtiMimeConverter::HandlerScopeFlag::DnD);
     m_drag->mimeData()->setData("application/x-qt-mime-type-name"_L1, QByteArray("dummy"));
     dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
 
@@ -136,11 +136,6 @@ bool QCocoaDrag::maybeDragMultipleItems()
     Q_ASSERT(m_drag && m_drag->mimeData());
     Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction);
 
-    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) {
-        // -dragImage: stopped working in 10.14 first.
-        return false;
-    }
-
     const QMacAutoReleasePool pool;
 
     NSView *view = m_lastView ? m_lastView : m_lastEvent.window.contentView;
@@ -161,8 +156,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
     for (NSPasteboardItem *item in dragBoard.pasteboardItems) {
         bool isUrl = false;
         for (NSPasteboardType type in item.types) {
-            using NSStringRef = NSString *;
-            if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) {
+            if ([type isEqualToString:UTTypeFileURL.identifier]) {
                 isUrl = true;
                 break;
             }
@@ -213,7 +207,9 @@ bool QCocoaDrag::maybeDragMultipleItems()
     }
 
     [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView];
-    internalDragLoop.exec();
+    QEventLoop eventLoop;
+    QScopedValueRollback updateGuard(m_internalDragLoop, &eventLoop);
+    eventLoop.exec();
     return true;
 }
 
@@ -224,8 +220,10 @@ void QCocoaDrag::setAcceptedAction(Qt::DropAction act)
 
 void QCocoaDrag::exitDragLoop()
 {
-    if (internalDragLoop.isRunning())
-        internalDragLoop.exit();
+    if (m_internalDragLoop) {
+        Q_ASSERT(m_internalDragLoop->isRunning());
+        m_internalDragLoop->exit();
+    }
 }
 
 
@@ -240,14 +238,14 @@ QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const
         QFontMetrics fm(f);
 
         if (data->hasImage()) {
-            const QImage img = data->imageData().value<QImage>();
+            QImage img = data->imageData().value<QImage>();
             if (!img.isNull()) {
-                pm = QPixmap::fromImage(img).scaledToWidth(dragImageMaxChars *fm.averageCharWidth());
+                pm = QPixmap::fromImage(std::move(img)).scaledToWidth(dragImageMaxChars *fm.averageCharWidth());
             }
         }
 
         if (pm.isNull() && (data->hasText() || data->hasUrls()) ) {
-            QString s = data->hasText() ? data->text() : data->urls().first().toString();
+            QString s = data->hasText() ? data->text() : data->urls().constFirst().toString();
             if (s.length() > dragImageMaxChars)
                 s = s.left(dragImageMaxChars -3) + QChar(0x2026);
             if (!s.isEmpty()) {
@@ -305,7 +303,7 @@ QStringList QCocoaDropData::formats_sys() const
         qDebug("DnD: Cannot get PasteBoard!");
         return formats;
     }
-    formats = QMacPasteboard(board, QUtiMimeConverter::HandlerScope::DnD).formats();
+    formats = QMacPasteboard(board, QUtiMimeConverter::HandlerScopeFlag::DnD).formats();
     return formats;
 }
 
@@ -317,7 +315,7 @@ QVariant QCocoaDropData::retrieveData_sys(const QString &mimeType, QMetaType) co
         qDebug("DnD: Cannot get PasteBoard!");
         return data;
     }
-    data = QMacPasteboard(board, QUtiMimeConverter::HandlerScope::DnD).retrieveData(mimeType);
+    data = QMacPasteboard(board, QUtiMimeConverter::HandlerScopeFlag::DnD).retrieveData(mimeType);
     CFRelease(board);
     return data;
 }
@@ -330,7 +328,7 @@ bool QCocoaDropData::hasFormat_sys(const QString &mimeType) const
         qDebug("DnD: Cannot get PasteBoard!");
         return has;
     }
-    has = QMacPasteboard(board, QUtiMimeConverter::HandlerScope::DnD).hasFormat(mimeType);
+    has = QMacPasteboard(board, QUtiMimeConverter::HandlerScopeFlag::DnD).hasFormat(mimeType);
     CFRelease(board);
     return has;
 }