diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-12-15 12:43:40 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-12-21 11:17:25 +0200 |
| commit | 5e0ba6b797ca7843609fc19d8c4c96f6f26aacd2 (patch) | |
| tree | c2f8ce62b8250af38ea82253a2892ba59ccd8514 /src/quick | |
| parent | 1241e4f3c3ec010ae121f5d56c3e9405ec43231f (diff) | |
DesignerSupport: Don't skip already inspected objects
Already inspected objects should not be skipped when determining their
properties, as recursive call will always have different base name for
the properties.
Internally we don't need inspectedObjects list at all anymore, but
it's kept to avoid changing API and in case the caller is interested
in inspected objects.
Fixes: QDS-3301
Change-Id: I76198b96d420e2a5ae6b13cfee65df4bce22d8f5
Pick-to: dev
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/designer/qquickdesignersupportproperties.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/quick/designer/qquickdesignersupportproperties.cpp b/src/quick/designer/qquickdesignersupportproperties.cpp index 335795acf1..fb6a5fb324 100644 --- a/src/quick/designer/qquickdesignersupportproperties.cpp +++ b/src/quick/designer/qquickdesignersupportproperties.cpp @@ -137,11 +137,8 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::propert if (inspectedObjects == nullptr) inspectedObjects = &localObjectList; - - if (inspectedObjects->contains(object)) - return propertyNameList; - - inspectedObjects->append(object); + if (!inspectedObjects->contains(object)) + inspectedObjects->append(object); const QMetaObject *metaObject = object->metaObject(); for (int index = 0; index < metaObject->propertyCount(); ++index) { @@ -194,12 +191,8 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::allProp if (inspectedObjects == nullptr) inspectedObjects = &localObjectList; - - if (inspectedObjects->contains(object)) - return propertyNameList; - - inspectedObjects->append(object); - + if (!inspectedObjects->contains(object)) + inspectedObjects->append(object); const QMetaObject *metaObject = object->metaObject(); |