diff options
| author | Kai Uwe Broulik <kde@privat.broulik.de> | 2024-03-02 09:25:58 +0000 |
|---|---|---|
| committer | Kai Uwe Broulik <kde@privat.broulik.de> | 2024-03-04 08:18:25 +0000 |
| commit | b3df93459d87f9dd79ea2740941878664322bcda (patch) | |
| tree | ea50da5edd6aac0e404dd509dc6f5d3a01ecd7e5 /src | |
| parent | 9b4638b6552a760825b275c33e22a50cfd5f182d (diff) | |
Revert "QWaylandDataDevice: Explicitly send null for rejected drag offer"
This reverts commit 853bbee25514132dfe00ec9d55fbdcb39365926e.
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/qwaylanddatadevice.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index a8d1748f2..a59b201f6 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -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()); } } |