diff options
| author | Kai Uwe Broulik <kde@privat.broulik.de> | 2024-02-20 17:53:19 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-22 16:06:19 +0000 |
| commit | d352a9c821128074a7d4963ca4d19e27aa479546 (patch) | |
| tree | 0b2e1d2f0b385a6f3ab7c4dcac16de047e6b28b2 | |
| parent | 5e246605c1d5901c4467883166814022ab47b716 (diff) | |
QWaylandDataDevice: Explicitly send null for rejected drag offer
qtwaylandscanner sends an empty string for a null QString
but `wl_data_offer.accept` uses null for "not accepted".
Pick-to: 6.6 6.5
Change-Id: I793d4315c9775a4bdc63085231318db8df829c8a
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 853bbee25514132dfe00ec9d55fbdcb39365926e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/client/qwaylanddatadevice.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index 9ff7fd947..f9aff5be7 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -334,7 +334,8 @@ void QWaylandDataDevice::sendResponse(Qt::DropActions supportedActions, const QP m_dragOffer->accept(m_enterSerial, m_dragOffer->firstFormat()); } else { - m_dragOffer->accept(m_enterSerial, QString()); + // qtwaylandscanner doesn't support null strings yet (sends empty string), call it directly. + ::wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, nullptr); } } |