1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "QWaylandDataDevice: Explicitly send null for rejected drag offer"

Browse Source 
This reverts commit 6b8be3a4a95f3861c6b2c5d62925cc03651a7ddd.

Reason for revert: QtWaylandScanner now sends null for a null QString when the argument is declared as allow-null

Change-Id: I5b7e23285b300b76dabfd2999ab90e90e7328232
Reviewed-by: David Redondo <qt@david-redondo.de>
This commit is contained in:
Kai Uwe Broulik 2024-03-02 09:25:58 +00:00
parent 4b58d6ddce
commit 7de67b2db7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -336,8 +336,7 @@ void QWaylandDataDevice::sendResponse(Qt::DropActions supportedActions, const QP
m_dragOffer->accept(m_enterSerial, m_dragOffer->firstFormat());
} else {
// qtwaylandscanner doesn't support null strings yet (sends empty string), call it directly.
::wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, nullptr);
m_dragOffer->accept(m_enterSerial, QString());
}
}