From fd4214205eb5896809d5afc2ef3d95ef8c74110f Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Wed, 4 Sep 2024 11:41:37 +0200
Subject: [PATCH] QmlDesigner: Extend SVG paste color parsing

Extend the SVG paste color parsing to support the following values
rgb(255,255,255) and rgba(255,255,255,1.0).

Task-number: QDS-13508
Change-Id: Id7750617b45a94b1541f5a40f31d610de56dbaee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../componentcore/svgpasteaction.cpp          | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/components/componentcore/svgpasteaction.cpp b/src/plugins/qmldesigner/components/componentcore/svgpasteaction.cpp
index 358e3dd5bee..f1b4dbb3f45 100644
--- a/src/plugins/qmldesigner/components/componentcore/svgpasteaction.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/svgpasteaction.cpp
@@ -814,8 +814,29 @@ QVariant convertValue(const QByteArray &key, const QString &value)
         return value.toInt();
     } else if (key == "opacity") {
         return value.toFloat();
-    } else if ((key == "fillColor" || key == "strokeColor") && value == "none") {
-        return "transparent";
+    } else if ((key == "fillColor" || key == "strokeColor")) {
+        if (value == "none")
+            return QColor(0, 0, 0, 0);
+
+        static const QRegularExpression reRGB(
+            R"(^rgb\((?<red>\d{1,3}),\s*(?<green>\d{1,3}),\s*(?<blue>\d{1,3})\)$)");
+        QRegularExpressionMatch match = reRGB.match(value);
+        if (match.hasMatch()) {
+            return QColor(match.captured("red").toInt(),
+                          match.captured("green").toInt(),
+                          match.captured("blue").toInt());
+        }
+
+        static const QRegularExpression reRGBA(
+            R"(^rgba\((?<red>\d{1,3}),\s*(?<green>\d{1,3}),\s*(?<blue>\d{1,3}),\s*(?<alpha>\d*(?:\.\d+))\)$)");
+        match = reRGBA.match(value);
+        if (match.hasMatch()) {
+            QColor color(match.captured("red").toInt(),
+                         match.captured("green").toInt(),
+                         match.captured("blue").toInt());
+            color.setAlphaF(match.captured("alpha").toFloat());
+            return color;
+        }
     }
 
     return value;