diff options
| author | Volker Hilsheimer <[email protected]> | 2024-01-24 14:30:32 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <[email protected]> | 2024-01-24 17:46:26 +0100 |
| commit | 97bb0ecfe628b5bb78e798563212adf02129c6f6 (patch) | |
| tree | 625a531b3b6cf44c16892962b0be5b873bbc1a4d | |
| parent | 6147b3f5b2da44b26ff736e3ec850f7cd4cd2ccf (diff) | |
Revert "macOS: Don't crash when starting a drag with empty mime data"
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.
Pick-to: 6.7 6.6 6.6.2 6.5
Task-number: QTBUG-119216
Change-Id: I8b74f2d9b89588cd35bca9ca20973810036a2635
Reviewed-by: Tor Arne Vestbø <[email protected]>
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoadrag.mm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm index 515fadfd08c..5089b4a44bc 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")); |