diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-20 23:37:31 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-20 23:37:32 +0200 |
| commit | cdc6c2164a80311979a6c247d6fb77d436612e5f (patch) | |
| tree | c0f15469440d862f0ff8e775d7804278811d0133 /src/qml/qml/qqmltype.cpp | |
| parent | ac9046b074a60ab73d7e76a48b8c69f00db9cbd2 (diff) | |
| parent | 7dc0de374300d66ed72f15820a4ebb78849ae0e7 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I5d7acb2a3883104d6002f147b58977ff58aa3383
Diffstat (limited to 'src/qml/qml/qqmltype.cpp')
| -rw-r--r-- | src/qml/qml/qqmltype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp index 96a35b0fe9..317d3c7ef5 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -276,7 +276,7 @@ void QQmlTypePrivate::initEnums(QQmlEnginePrivate *engine) const ? compositePropertyCache(engine) : nullptr; - const QMetaObject *metaObject = !isEnumFromCacheSetup + const QMetaObject *metaObject = !isEnumFromBaseSetup ? baseMetaObject // beware: It could be a singleton type without metaobject : nullptr; |