diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-01-24 14:30:32 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-01-25 16:17:51 +0000 |
| commit | 137a3257565bcfcee667128e05e3558da2a94141 (patch) | |
| tree | 1b2934107608c6ac4b9445b322ede0acfe2a3db6 | |
| parent | ed3d0ee5c0dad4334d1aad811b094abaaca4d21a (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.
Task-number: QTBUG-119216
Fixes: QTBUG-121512
Change-Id: I8b74f2d9b89588cd35bca9ca20973810036a2635
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 97bb0ecfe628b5bb78e798563212adf02129c6f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit edc4e555454c34bad17e7a5fce338a966a3c57d1)
(cherry picked from commit f4e8177411edb5d2ee2b238bc5194660ef0edad9)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -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 5fb3c5141a..a8c0392f8b 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")); |