From 1f26b49f6f398b34e39fda9fee4e55928079a442 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 28 Sep 2020 12:11:27 +0200 Subject: Fix compilation after mime data API changes Follows 848927b688d4709d0b71590518e2c32fe7866147 in qtbase, where the signature of retrieveData_sys() was changed. Fixes: QTBUG-87003 Change-Id: I8b88c8f9547e599328f40345a9fbf57c07ec31a4 Reviewed-by: Lars Knoll --- src/client/qwaylanddataoffer.cpp | 2 +- src/client/qwaylanddataoffer_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp index 2297e8a16..5d0a8d472 100644 --- a/src/client/qwaylanddataoffer.cpp +++ b/src/client/qwaylanddataoffer.cpp @@ -124,7 +124,7 @@ QStringList QWaylandMimeData::formats_sys() const return m_types; } -QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QVariant::Type type) const +QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QMetaType type) const { Q_UNUSED(type); diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h index 9cf1483ca..50c05732b 100644 --- a/src/client/qwaylanddataoffer_p.h +++ b/src/client/qwaylanddataoffer_p.h @@ -106,7 +106,7 @@ public: protected: bool hasFormat_sys(const QString &mimeType) const override; QStringList formats_sys() const override; - QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const override; + QVariant retrieveData_sys(const QString &mimeType, QMetaType type) const override; private: int readData(int fd, QByteArray &data) const; -- cgit v1.2.3