From 2c24b007332ad8304a0ada5aff2073fe95c83724 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 9 Mar 2017 10:35:39 +0100 Subject: [PATCH] Temporary change to prepare for qtbase change QPlatformDrag::platformDropData() will be removed in qtbase. By removing the 'override' specifier, we make sure that qtwayland will compile with both versions, so we can get the changes through the CI system. Change-Id: I8f5f3252ecc5125e5dab3f7a4da8760fe259b739 Reviewed-by: Albert Astals Cid Reviewed-by: Lars Knoll --- src/plugins/platforms/wayland/qwaylanddnd_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/qwaylanddnd_p.h b/src/plugins/platforms/wayland/qwaylanddnd_p.h index 2a99432c59d..6d87c75d78a 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd_p.h +++ b/src/plugins/platforms/wayland/qwaylanddnd_p.h @@ -71,7 +71,7 @@ public: QWaylandDrag(QWaylandDisplay *display); ~QWaylandDrag(); - QMimeData *platformDropData() override; + QMimeData *platformDropData(); void updateTarget(const QString &mimeType); void setResponse(const QPlatformDragQtResponse &response);