From 6b8be3a4a95f3861c6b2c5d62925cc03651a7ddd Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 20 Feb 2024 17:53:19 +0100 Subject: [PATCH] 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.7 6.6 6.5 Change-Id: I793d4315c9775a4bdc63085231318db8df829c8a Reviewed-by: David Edmundson --- src/plugins/platforms/wayland/qwaylanddatadevice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp index a59b201f670..a8d1748f268 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp +++ b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp @@ -336,7 +336,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); } }