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