diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-26 16:50:21 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-14 05:24:17 +0000 |
| commit | 218fb96808f9ca4470427f68141eac64d1ad96f6 (patch) | |
| tree | 801d1c97dd067dd2af5d68eb97f954a3e1e6375d /src/qml/qml/qqmlpropertycache.cpp | |
| parent | ee35b2da3921704c0eac5617687db74f46892632 (diff) | |
Handle changes in MOC internals
Needed with newer qtbase
Change-Id: I84222b06c615d60ad004512e43d3b6c6e904baea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 88eda9c020..2bdc5cccb1 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1360,7 +1360,7 @@ template <typename StringVisitor> int visitEnumerations(const QMetaObject &mo, StringVisitor visitString) { const QMetaObjectPrivate *const priv = reinterpret_cast<const QMetaObjectPrivate*>(mo.d.data); - const int intsPerEnumerator = 4; + const int intsPerEnumerator = priv->revision >= 8 ? 5 : 4; int fieldCount = priv->enumeratorCount * intsPerEnumerator; @@ -1412,7 +1412,7 @@ bool QQmlPropertyCache::determineMetaObjectSizes(const QMetaObject &mo, int *fie int *stringCount) { const QMetaObjectPrivate *priv = reinterpret_cast<const QMetaObjectPrivate*>(mo.d.data); - if (priv->revision != 7) { + if (priv->revision < 7 || priv->revision > 8) { return false; } |