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/windows/qwindowsinternalmimedata.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/windows/qwindowsinternalmimedata.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsinternalmimedata.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp index 21f64f04b6..5f63adba52 100644 --- a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp +++ b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp @@ -90,8 +90,7 @@ QStringList QWindowsInternalMimeData::formats_sys() const return fmts; } -QVariant QWindowsInternalMimeData::retrieveData_sys(const QString &mimeType, - QVariant::Type type) const +QVariant QWindowsInternalMimeData::retrieveData_sys(const QString &mimeType, QMetaType type) const { IDataObject *pDataObj = retrieveDataObject(); if (!pDataObj) @@ -103,9 +102,9 @@ QVariant QWindowsInternalMimeData::retrieveData_sys(const QString &mimeType, result = converter->convertToMime(mimeType, pDataObj, type); releaseDataObject(pDataObj); if (QWindowsContext::verbose) { - qCDebug(lcQpaMime) <<__FUNCTION__ << ' ' << mimeType << ' ' << type - << " returns " << result.type() - << (result.type() != QVariant::ByteArray ? result.toString() : QStringLiteral("<data>")); + qCDebug(lcQpaMime) <<__FUNCTION__ << ' ' << mimeType << ' ' << type.name() + << " returns " << result.metaType().name() + << (result.userType() != QVariant::ByteArray ? result.toString() : QStringLiteral("<data>")); } return result; } |