diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-22 07:34:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-22 07:34:02 +0200 |
| commit | 1dafbae0006de63621b7721cca7557756fcfd8ba (patch) | |
| tree | c127743200fb1696e146aa782826b886ab6b6794 /src/qml/qml/qqmltype.cpp | |
| parent | 5728f48834b9225a36d3e1dae44ced7579cde358 (diff) | |
| parent | 6555642db7b3b992335f98dc01863db4beea3fd4 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iafb7061945e011542fbf0f6ebe776f0a4187b0a4
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 b02df4a3e4..0b21cc22ee 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -275,7 +275,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; |