diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 19:51:38 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-21 14:56:09 +0200 |
commit | 848927b688d4709d0b71590518e2c32fe7866147 (patch) | |
tree | 67c7db42436563299ab8fc713dbc91ce31eaf508 /src/plugins/platforms/xcb/qxcbdrag.cpp | |
parent | cf015cd08bc7a977b6bacac3575952a77e0c0cad (diff) |
Cleanup API of QMimeData
Do not use QVariant::Type anymore, instead use QMetaType
For some reason, this pushed the qvariant autotest over the limit where
MSVC requires the /bigobj flag, so add that one.
[ChangeLog][QtCore][QMimeData] The signature of the virtual retrieveData()
function has changed and now takes a QMetaType instead of a QVariant::Type.
Change-Id: Ib46773bd731ee2177b1ef74d8162d744be7017ef
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbdrag.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 774a5689c7..401863790c 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -112,9 +112,9 @@ 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; - QVariant xdndObtainData(const QByteArray &format, QMetaType::Type requestedType) const; + QVariant xdndObtainData(const QByteArray &format, QMetaType requestedType) const; QXcbDrag *drag; }; @@ -1342,14 +1342,14 @@ QXcbDropData::~QXcbDropData() { } -QVariant QXcbDropData::retrieveData_sys(const QString &mimetype, QVariant::Type requestedType) const +QVariant QXcbDropData::retrieveData_sys(const QString &mimetype, QMetaType requestedType) const { QByteArray mime = mimetype.toLatin1(); - QVariant data = xdndObtainData(mime, QMetaType::Type(requestedType)); + QVariant data = xdndObtainData(mime, requestedType); return data; } -QVariant QXcbDropData::xdndObtainData(const QByteArray &format, QMetaType::Type requestedType) const +QVariant QXcbDropData::xdndObtainData(const QByteArray &format, QMetaType requestedType) const { QByteArray result; |