From 7de67b2db7e1fb6632039828678f0f8e6e92e91f Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Sat, 2 Mar 2024 09:25:58 +0000 Subject: [PATCH] Revert "QWaylandDataDevice: Explicitly send null for rejected drag offer" 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 --- src/plugins/platforms/wayland/qwaylanddatadevice.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp index a8d1748f268..a59b201f670 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp +++ b/src/plugins/platforms/wayland/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()); } }