Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	src/compositor/wayland_wrapper/qwldatadevice.cpp

Change-Id: I2f555f969ec36b3e9b4123d758ae4176c5c90164

2 files changed, 12 insertions, 2 deletions

diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp
index 87b93f231..521e5dda5 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp
@@ -155,6 +155,7 @@ void DataDevice::drop()
         m_dragDataSource->cancel();
     }
     m_dragOrigin = nullptr;
+    setDragIcon(nullptr);
 }
 
 void DataDevice::cancelDrag()
@@ -167,9 +168,8 @@ void DataDevice::data_device_start_drag(Resource *resource, struct ::wl_resource
     m_dragClient = resource->client();
     m_dragDataSource = source ? DataSource::fromResource(source) : 0;
     m_dragOrigin = QWaylandSurface::fromResource(origin);
-    m_dragIcon = icon ? QWaylandSurface::fromResource(icon) : 0;
     QWaylandDrag *drag = m_inputDevice->drag();
-    Q_EMIT drag->iconChanged();
+    setDragIcon(icon ? QWaylandSurface::fromResource(icon) : nullptr);
     Q_EMIT drag->dragStarted();
     Q_EMIT m_dragOrigin->dragStarted(drag);
 
@@ -202,6 +202,14 @@ void DataDevice::data_device_set_selection(Resource *, struct ::wl_resource *sou
     }
 }
 
+void DataDevice::setDragIcon(QWaylandSurface *icon)
+{
+    if (icon == m_dragIcon)
+        return;
+    m_dragIcon = icon;
+    Q_EMIT m_inputDevice->drag()->iconChanged();
+}
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h
index 62d6021f7..6a8e4e381 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h
@@ -83,6 +83,8 @@ protected:
     void data_device_set_selection(Resource *resource, struct ::wl_resource *source, uint32_t serial) Q_DECL_OVERRIDE;
 
 private:
+    void setDragIcon(QWaylandSurface *icon);
+
     QWaylandCompositor *m_compositor;
     QWaylandInputDevice *m_inputDevice;