diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-17 10:59:47 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-23 20:50:04 +0200 |
commit | 48b4c1f450109b148f03f62574d78b460859c4a1 (patch) | |
tree | bbd5f5f2e123444c28179e5886684535c8d09830 /src/qml/jsruntime/qv4vme_moth.cpp | |
parent | f7100fbaaceb7c74b164a9130218a197454433cf (diff) |
Adapt to qtbase changes
The internal QVariant constructor taking a QMetaTypeId has been removed.
Thus, construct QMetaTypes where necessary from the id, or avoid a
QMetaType -> ID -> QMetaType roundtrip where we already have a metatype.
Also fix a few missing includse that were previously transitively
included.
Change-Id: I56ce92281d616108a4ff80fe5052b919d1282357
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4vme_moth.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index 7772b34c82..5bb82aeadf 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -463,7 +463,7 @@ ReturnedValue VME::exec(CppStackFrame *frame, ExecutionEngine *engine) Scope scope(engine); Scoped<QmlContext> qmlContext(scope, engine->qmlContext()); - QVariant resultVariant(function->aotFunction->returnType.id(), nullptr); + QVariant resultVariant(function->aotFunction->returnType, nullptr); function->aotFunction->functionPtr(qmlContext->qmlContext()->asQQmlContext(), qmlContext->qmlScope(), resultVariant.data()); result = engine->fromVariant(resultVariant); } else { |