crash fix - avoid wrong gcc optimization

This fixes a crash that gcc optimized the code in the
way that inspectedObjects->contains(object) executed
at a nullptr. (only release only some gcc versions)

This was already fixed in the past but reintroduced by
another commit in the past.

Pick-to: 5.15 6.1 6.2
Task-number: QTBUG-94798
Change-Id: I9759f3347712f706dd99303ce9d804667c1525f3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

2 files changed, 8 insertions, 9 deletions

diff --git a/src/quick/designer/qquickdesignersupportproperties.cpp b/src/quick/designer/qquickdesignersupportproperties.cpp
index c9b042a1ef..8febf9a80a 100644
--- a/src/quick/designer/qquickdesignersupportproperties.cpp
+++ b/src/quick/designer/qquickdesignersupportproperties.cpp
@@ -126,17 +126,12 @@ void QQuickDesignerSupportProperties::getPropertyCache(QObject *object, QQmlEngi
     QQmlEnginePrivate::get(engine)->cache(object->metaObject());
 }
 
-QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::propertyNameListForWritableProperties(QObject *object,
+static QQuickDesignerSupport::PropertyNameList propertyNameListForWritableProperties(QObject *object,
                                                        const QQuickDesignerSupport::PropertyName &baseName,
                                                        QObjectList *inspectedObjects)
 {
     QQuickDesignerSupport::PropertyNameList propertyNameList;
 
-    QObjectList localObjectList;
-
-    if (inspectedObjects == nullptr)
-        inspectedObjects = &localObjectList;
-
     if (!inspectedObjects->contains(object))
         inspectedObjects->append(object);
 
@@ -169,6 +164,12 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::propert
     return propertyNameList;
 }
 
+QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::propertyNameListForWritableProperties(QObject *object)
+{
+    QObjectList localObjectList;
+    return ::propertyNameListForWritableProperties(object, {}, &localObjectList);
+}
+
 bool QQuickDesignerSupportProperties::isPropertyBlackListed(const QQuickDesignerSupport::PropertyName &propertyName)
 {
     if (propertyName.contains(".") && propertyName.contains("__"))
diff --git a/src/quick/designer/qquickdesignersupportproperties_p.h b/src/quick/designer/qquickdesignersupportproperties_p.h
index 02e75ea886..90961824a6 100644
--- a/src/quick/designer/qquickdesignersupportproperties_p.h
+++ b/src/quick/designer/qquickdesignersupportproperties_p.h
@@ -90,9 +90,7 @@ public:
 
     static void getPropertyCache(QObject *object, QQmlEngine *engine);
     static bool isPropertyBlackListed(const QQuickDesignerSupport::PropertyName &propertyName);
-    static QQuickDesignerSupport::PropertyNameList propertyNameListForWritableProperties(QObject *object,
-                                                                  const QQuickDesignerSupport::PropertyName &baseName = QQuickDesignerSupport::PropertyName(),
-                                                                  QObjectList *inspectedObjects = nullptr);
+    static QQuickDesignerSupport::PropertyNameList propertyNameListForWritableProperties(QObject *object);
     static QQuickDesignerSupport::PropertyNameList allPropertyNames(QObject *object,
                                              const QQuickDesignerSupport::PropertyName &baseName = QQuickDesignerSupport::PropertyName(),
                                              QObjectList *inspectedObjects = nullptr);