diff options
Diffstat (limited to 'src/qml/qml/qqmlglobal.cpp')
| -rw-r--r-- | src/qml/qml/qqmlglobal.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index 558da1d64b..1fbb9889c2 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -80,13 +80,13 @@ QVariant QQmlValueTypeProvider::createValueType(int type, const QJSValue ¶ms return QVariant(); } -bool QQmlValueTypeProvider::createValueFromString(int type, const QString &s, void *data, size_t n) +bool QQmlValueTypeProvider::createValueFromString(int type, const QJSValue &s, QVariant *data) { Q_ASSERT(data); QQmlValueTypeProvider *p = this; do { - if (p->createFromString(type, s, data, n)) + if (p->create(type, s, data)) return true; } while ((p = p->next)); @@ -169,7 +169,6 @@ bool QQmlValueTypeProvider::writeValueType(int type, const void *src, QVariant& } bool QQmlValueTypeProvider::create(int, const QJSValue &, QVariant *) { return false; } -bool QQmlValueTypeProvider::createFromString(int, const QString &, void *, size_t) { return false; } bool QQmlValueTypeProvider::variantFromString(int, const QString &, QVariant *) { return false; } bool QQmlValueTypeProvider::store(int, const void *, void *, size_t) { return false; } |