aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlglobal_p.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-18 14:43:04 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-09-23 14:54:47 +0200
commit548124fd008501d027f1aeb1fb9de03de233b320 (patch)
tree2e89e22945c12da9a64c9b18c993bc1276740790 /src/qml/qml/qqmlglobal_p.h
parent20a1002fba8c14514f5a40a9c468adb4c84410d3 (diff)
Remove QQmlValueTypeProvider::variantFromJsObject
This can be expressed in terms of create(). Change-Id: Id1950390bf4a1c9dfd9364ea351b81c75eb7e28f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlglobal_p.h')
-rw-r--r--src/qml/qml/qqmlglobal_p.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index 707fc0ea1c..a0efca8688 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -228,7 +228,7 @@ public:
bool createValueFromString(int, const QString &, void *, size_t);
QVariant createVariantFromString(int, const QString &, bool *);
- QVariant createVariantFromJsObject(int, const QV4::Value &, QV4::ExecutionEngine *, bool *);
+ QVariant createVariantFromJsObject(int, const QJSValue &, bool *);
bool equalValueType(int, const void *, const QVariant&);
bool storeValueType(int, const void *, void *, size_t);
@@ -240,7 +240,6 @@ private:
virtual bool createFromString(int, const QString &, void *, size_t);
virtual bool variantFromString(int, const QString &, QVariant *);
- virtual bool variantFromJsObject(int, const QV4::Value &, QV4::ExecutionEngine *, QVariant *);
virtual bool store(int, const void *, void *, size_t);