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/corelib/kernel/qmimedata.h | |
| 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/corelib/kernel/qmimedata.h')
| -rw-r--r-- | src/corelib/kernel/qmimedata.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h index 64235832c2..e6ec690181 100644 --- a/src/corelib/kernel/qmimedata.h +++ b/src/corelib/kernel/qmimedata.h @@ -85,8 +85,7 @@ public: void clear(); protected: - virtual QVariant retrieveData(const QString &mimetype, - QVariant::Type preferredType) const; + virtual QVariant retrieveData(const QString &mimetype, QMetaType preferredType) const; private: Q_DISABLE_COPY(QMimeData) Q_DECLARE_PRIVATE(QMimeData) |