From 137a3257565bcfcee667128e05e3558da2a94141 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 24 Jan 2024 14:30:32 +0100 Subject: [PATCH] Revert "macOS: Don't crash when starting a drag with empty mime data" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 09afa7575276d7b500f17671a1ca9ca677767b44. It broke Qt Designer, which creates QDrag objects without any mime format. It's likely that user code does the same to support internal drag'n'drop. Task-number: QTBUG-119216 Fixes: QTBUG-121512 Change-Id: I8b74f2d9b89588cd35bca9ca20973810036a2635 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 97bb0ecfe628b5bb78e798563212adf02129c6f6) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit edc4e555454c34bad17e7a5fce338a966a3c57d1) (cherry picked from commit f4e8177411edb5d2ee2b238bc5194660ef0edad9) Reviewed-by: Volker Hilsheimer --- src/plugins/platforms/cocoa/qcocoadrag.mm | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm index 5fb3c5141a7..a8c0392f8ba 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.mm +++ b/src/plugins/platforms/cocoa/qcocoadrag.mm @@ -97,8 +97,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) { m_drag = o; m_executed_drop_action = Qt::IgnoreAction; - if (o->mimeData()->formats().isEmpty()) - return m_executed_drop_action; QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QUtiMimeConverter::HandlerScopeFlag::DnD); m_drag->mimeData()->setData("application/x-qt-mime-type-name"_L1, QByteArray("dummy"));