diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-10 01:01:21 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-10 09:35:18 +0200 |
| commit | 35f59635087a36e5037a9590ce0b0da0b138c488 (patch) | |
| tree | 51e56fefa3b13fe69d290473f19e86cad3ef8ba6 /src/qml/qml/qqmltype_p_p.h | |
| parent | 96c4fffd8648e9c9fb95e8208a76933c8c2120bc (diff) | |
| parent | 8c3172d724f3ad03cdee7bae23443fa109d350b1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlmetatype.cpp
src/qml/types/qqmlmodelsmodule.cpp
Change-Id: Idc63689ba98d83a455283674f4b5cf3014473605
Diffstat (limited to 'src/qml/qml/qqmltype_p_p.h')
| -rw-r--r-- | src/qml/qml/qqmltype_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltype_p_p.h b/src/qml/qml/qqmltype_p_p.h index 380139f385..dd6e046129 100644 --- a/src/qml/qml/qqmltype_p_p.h +++ b/src/qml/qml/qqmltype_p_p.h @@ -120,7 +120,8 @@ public: int index; mutable volatile bool isSetup:1; - mutable volatile bool isEnumSetup:1; + mutable volatile bool isEnumFromCacheSetup:1; + mutable volatile bool isEnumFromBaseSetup:1; mutable bool haveSuperType:1; mutable QList<QQmlProxyMetaObject::ProxyData> metaObjects; mutable QStringHash<int> enums; |