aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-22 09:09:22 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-09-25 19:09:45 +0200
commit95a8522c8c303f388034d9bf59817eed67fe466a (patch)
tree4d359211fa726b67aeaf8c1d2687fb86b210d0ec /src
parentfe27257a0722c777968c81027b65b0a7bda3f53e (diff)
QQuickTextControl: Adapt to API change for retrieveData()
Change-Id: I7010c3fc1e922672eece4e2fee15e747ff21589c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicktextcontrol.cpp2
-rw-r--r--src/quick/items/qquicktextcontrol_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 06f3e6c40a..6c0ad0ae7d 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -1872,7 +1872,7 @@ QStringList QQuickTextEditMimeData::formats() const
return QMimeData::formats();
}
-QVariant QQuickTextEditMimeData::retrieveData(const QString &mimeType, QVariant::Type type) const
+QVariant QQuickTextEditMimeData::retrieveData(const QString &mimeType, QMetaType type) const
{
if (!fragment.isEmpty())
setup();
diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h
index eb5cd27994..4da895f2c3 100644
--- a/src/quick/items/qquicktextcontrol_p.h
+++ b/src/quick/items/qquicktextcontrol_p.h
@@ -205,7 +205,7 @@ public:
QStringList formats() const override;
protected:
- QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override;
+ QVariant retrieveData(const QString &mimeType, QMetaType type) const override;
private:
void setup() const;