From 84bdcae35aec805f26593c1125ddefb213b49602 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Thu, 15 May 2025 17:08:34 +0200
Subject: [PATCH] QmlDesigner: Fix corner radii for older QtQick

Remove a warning that pops up when the QtQuick version that is used
doesn't contain independent corner radii for Rectangle.

Change-Id: Ideef90d47394bec31fd2ce0ff3f406638c32ac70
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit 80dbdfe03261667140c2205e306378ae1784b022)
---
 .../QtQuick/RectangleSpecifics.qml                  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
index cdcea69e066..6afd94b72e0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
@@ -75,4 +75,17 @@ Column {
             }
         }
     }
+<<<<<<< HEAD   (08c2c6 QmlDesigner: Fix shape rendering in 2D view)
+=======
+
+    CornerRadiusSection {
+        id: cornerRadiusSection
+        property bool radiiAvailable: backendValues.topLeftRadius?.isAvailable ?? false
+                                // && backendValues.topRightRadius.isAvailable
+                                // && backendValues.bottomLeftRadius.isAvailable
+                                // && backendValues.bottomRightRadius.isAvailable
+
+        visible: majorQtQuickVersion >= 6 && minorQtQuickVersion >= 7 && cornerRadiusSection.radiiAvailable
+    }
+>>>>>>> CHANGE (80dbdf QmlDesigner: Fix corner radii for older QtQick)
 }