diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-12 09:55:25 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-12 09:56:04 +0200 |
| commit | 29316abe1ad363179cfc2eefe31d085131d1dfd7 (patch) | |
| tree | 4f1248046acb0a87de7f8762ec98de3fbc9f47f1 /src/qml/qml/qqmlmetatype.cpp | |
| parent | bde8c3cd9583ed9f3bdfc36a8699f56db20a6928 (diff) | |
| parent | 47b3b1b10246cad6709c0cd99f02208dbaf6b7c0 (diff) | |
Merge remote-tracking branch 'origin/5.10' into wip/new-backend
Change-Id: Iccb35fab856c7d8ec4aaaf021b70a65cfaa564b3
Diffstat (limited to 'src/qml/qml/qqmlmetatype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 3dfdbf572a..a9464c9759 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -812,10 +812,10 @@ void QQmlTypePrivate::insertEnumsFromPropertyCache(const QQmlPropertyCache *cach const QMetaObject *cppMetaObject = cache->firstCppMetaObject(); while (cache && cache->metaObject() != cppMetaObject) { - QStringHash<int> *scoped = new QStringHash<int>(); int count = cache->qmlEnumCount(); for (int ii = 0; ii < count; ++ii) { + QStringHash<int> *scoped = new QStringHash<int>(); QQmlEnumData *enumData = cache->qmlEnum(ii); for (int jj = 0; jj < enumData->values.count(); ++jj) { |