diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-16 17:29:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 11:49:34 +0100 |
| commit | 3e3de9e357fa55074ff6025d68c0477ac5da30ae (patch) | |
| tree | 93e310889f88733115e253c0a5dfbdb801ac76cf /src/qml/compiler | |
| parent | 65e7af6a0bd1a0785a2534d22681c6b48f0ed899 (diff) | |
[new compiler] Fix id mapping in implicitly defined components
When scanning for component roots of explicitly defined components, make sure
to skip synthetized ones. Now samegame runs :)
Change-Id: If64171aefc1105a130a1a50e855af87977d2f3af
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index d6dde63d4b..a4301fdc08 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -841,7 +841,8 @@ bool QQmlComponentAndAliasResolver::resolve() // someItemDelegate: Item {} // In the implicit case Item is surrounded by a synthetic Component {} because the property // on the left hand side is of QQmlComponent type. - for (int i = 0; i < qmlObjects->count(); ++i) { + const int objCountWithoutSynthesizedComponents = qmlObjects->count(); + for (int i = 0; i < objCountWithoutSynthesizedComponents; ++i) { const QtQml::QmlObject *obj = qmlObjects->at(i); if (stringAt(obj->inheritedTypeNameIndex).isEmpty()) continue; |