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/ios | |
| 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/ios')
| -rw-r--r-- | src/plugins/platforms/ios/qiosclipboard.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm index 236ca843d8..dc441c7194 100644 --- a/src/plugins/platforms/ios/qiosclipboard.mm +++ b/src/plugins/platforms/ios/qiosclipboard.mm @@ -138,7 +138,7 @@ public: ~QIOSMimeData() { } QStringList formats() const override; - QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override; + QVariant retrieveData(const QString &mimeType, QMetaType type) const override; private: const QClipboard::Mode m_mode; @@ -160,7 +160,7 @@ QStringList QIOSMimeData::formats() const return foundMimeTypes; } -QVariant QIOSMimeData::retrieveData(const QString &mimeType, QVariant::Type) const +QVariant QIOSMimeData::retrieveData(const QString &mimeType, QMetaType) const { UIPasteboard *pb = [UIPasteboard pasteboardWithQClipboardMode:m_mode]; NSArray<NSString *> *pasteboardTypes = [pb pasteboardTypes]; |