diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-09-21 13:38:02 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-09-21 16:30:55 +0000 |
| commit | e5605d6bf486808a1290f76f2861d4f70e064398 (patch) | |
| tree | a3254c51cd776cd1cf69e1ef049c8a247deaa299 /src | |
| parent | e8d5eed76b3b1920aedb43662a2c184a082fc7b1 (diff) | |
QCocoaDrag::maybeDragMultipleItems - fix erroneous size check
Due to somewhat inverted logic introduced by the 8481a9fc974a1f1dd44a,
testing number of items in a pasteboard happens _before_ we fill it,
which is wrong and useless. As a result, maybeDragMultipleItems will
prevent the single item drag.
Task-number: QTCREATORBUG-24665
Task-number: QTBUG-86786
Change-Id: Ia4be9fc56677575bb363cbb8b1adbea59e6c3b0b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit b8a03411784803c07ecc1f769860756d6fdc04cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoadrag.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm index ab6863a432..c6ee4323ce 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.mm +++ b/src/plugins/platforms/cocoa/qcocoadrag.mm @@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems() const auto &qtUrls = m_drag->mimeData()->urls(); NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; - if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) { + if (qtUrls.size() <= 1) { // Good old -dragImage: works perfectly for this ... return false; } |