1 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/client/shared/datadevice.cpp b/tests/auto/client/shared/datadevice.cpp
index 100f937d3..efb88d0b1 100644
--- a/tests/auto/client/shared/datadevice.cpp
+++ b/tests/auto/client/shared/datadevice.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "datadevice.h"
 
@@ -7,7 +7,7 @@ namespace MockCompositor {
 
 bool DataDeviceManager::isClean()
 {
-    for (auto *device : qAsConst(m_dataDevices)) {
+    for (auto *device : std::as_const(m_dataDevices)) {
         // The client should not leak selection offers, i.e. if this fails, there is a missing
         // data_offer.destroy request
         if (!device->m_sentSelectionOffers.empty())
@@ -51,7 +51,7 @@ DataOffer *DataDevice::sendDataOffer(wl_client *client, const QStringList &mimeT
 {
     Q_ASSERT(client);
     auto *offer = new DataOffer(this, client, m_manager->m_version);
-    m_offers << offer;
+    m_offer = offer;
     for (auto *resource : resourceMap().values(client))
         wl_data_device::send_data_offer(resource->handle, offer->resource()->handle);
     for (const auto &mimeType : mimeTypes)
@@ -71,8 +71,8 @@ void DataDevice::sendEnter(Surface *surface, const QPoint &position)
 {
     uint serial = m_manager->m_compositor->nextSerial();
     Resource *resource = resourceMap().value(surface->resource()->client());
-    for (DataOffer *offer: m_offers)
-        wl_data_device::send_enter(resource->handle, serial, surface->resource()->handle, position.x(), position.y(), offer->resource()->handle);
+    if (m_offer)
+        wl_data_device::send_enter(resource->handle, serial, surface->resource()->handle, position.x(), position.y(), m_offer->resource()->handle);
 }
 
 void DataDevice::sendMotion(Surface *surface, const QPoint &position)
@@ -108,10 +108,7 @@ void DataOffer::data_offer_receive(Resource *resource, const QString &mime_type,
 
 void DataOffer::data_offer_destroy(QtWaylandServer::wl_data_offer::Resource *resource)
 {
-    bool removed = m_dataDevice->m_sentSelectionOffers.removeOne(this);
-    if (!removed)
-        removed = m_dataDevice->m_offers.removeOne(this);
-    QVERIFY(removed);
+    m_dataDevice->m_sentSelectionOffers.removeOne(this);
     wl_resource_destroy(resource->handle);
 }