diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-23 15:58:30 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 13:13:30 +0200 |
| commit | 5c6534773f5329d6245891879ff2eb5f82b1f2a0 (patch) | |
| tree | 0cd0500256f77920ae3982c9938f3cc2fdfa5a3f /src/qml/qml/qqmlobjectcreator_p.h | |
| parent | b3449f333bede37d6eaf24a1abc0d746e5b4b1a7 (diff) | |
Fix component boundary detection
For a component boundary, the type in question has to be an actual
QQmlComponent. If it's a type that itself is derived from a component (type ==
0 && component != 0 in typereference), then it is not a boundary.
Fixes tst_qqmllanguage::componentCompositeType
Change-Id: I938abe94c2fa4c69788176235ac74d0c6e385c0c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 131271c5c6..8412e227dd 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -100,6 +100,9 @@ protected: bool collectIdsAndAliases(int objectIndex); bool resolveAliases(); + bool isComponentType(int typeNameIndex) const + { return resolvedTypes.value(typeNameIndex).type == 0; } + int _componentIndex; QHash<int, int> _idToObjectIndex; QHash<int, int> *_objectIndexToIdInScope; |