diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-26 08:27:42 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-26 08:45:00 +0100 |
| commit | 09d5b30936933af87ff03db25a6fbfd37e71bba8 (patch) | |
| tree | 1205c1dbb89342e5640435cf85b67b620fefb7b2 /src/quicktemplates2 | |
| parent | 23cad8990c5df9a65ceccb1db7f023561753ec0b (diff) | |
Adjust to QV4Engine::toVariant signature change
Change-Id: I82aa23bf35cb611978939fcbda8baf9520fc2f32
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickstackview_p.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 47254959..aceae36a 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -1371,7 +1371,7 @@ void QQuickMenu::popup(QQmlV4Function *args) if (pos.isNull && (len >= 2 || (!parentItem && len >= 1))) { // point pos QV4::ScopedValue posArg(scope, (*args)[parentItem ? 1 : 0]); - const QVariant var = v4->toVariant(posArg, -1); + const QVariant var = v4->toVariant(posArg, QMetaType {}); if (var.userType() == QMetaType::QPointF) pos = var.toPointF(); } diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp index 13e79e0e..c2b5d514 100644 --- a/src/quicktemplates2/qquickstackview_p.cpp +++ b/src/quicktemplates2/qquickstackview_p.cpp @@ -183,7 +183,7 @@ QQuickStackElement *QQuickStackViewPrivate::createElement(const QV4::Value &valu return QQuickStackElement::fromString(resolvedUrl(u->href(), context), q, error); if (const QV4::Object *v = value.as<QV4::Object>()) { - const QVariant data = v->engine()->toVariant(value, QMetaType::QUrl); + const QVariant data = v->engine()->toVariant(value, QMetaType::fromType<QUrl>()); if (data.typeId() == QMetaType::QUrl) { return QQuickStackElement::fromString(resolvedUrl(data.toUrl(), context).toString(), q, error); |