aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypedata.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2020-01-07 11:37:01 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2020-03-09 10:54:37 +0100
commitf3dccc334f01d088fcdf1c2016c8153fe6154b61 (patch)
tree7b8148f8ba1dcf53fc9f56a46fa42e810b699316 /src/qml/qml/qqmltypedata.cpp
parentf65c0e7190c4f2ebcadc963cf0647c71de26f3bb (diff)
Adapt to the the new QMetaType change
Fixes: QTBUG-82453 Change-Id: I7e5682945a07c3af183becd3947a69568f139d16 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypedata.cpp')
-rw-r--r--src/qml/qml/qqmltypedata.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypedata.cpp b/src/qml/qml/qqmltypedata.cpp
index 9d44e85ba4..7b21edec37 100644
--- a/src/qml/qml/qqmltypedata.cpp
+++ b/src/qml/qml/qqmltypedata.cpp
@@ -934,7 +934,8 @@ QQmlError QQmlTypeData::buildTypeResolutionCaches(
ref->type = qmlType;
if (qmlType.isValid()) {
// this is required for inline components in singletons
- auto typeID = qmlType.lookupInlineComponentById(qmlType.inlineComponendId()).typeId();
+ auto type = qmlType.lookupInlineComponentById(qmlType.inlineComponendId()).typeId();
+ auto typeID = type.isValid() ? type.id() : -1;
auto exUnit = engine->obtainExecutableCompilationUnit(typeID);
if (exUnit) {
ref->compilationUnit = exUnit;