From c76025ed417ec893c4a8c71de496b78cedd33b97 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Tue, 23 Jul 2024 11:10:59 +0200
Subject: [PATCH] Lua: Allow category icon as filepath

Change-Id: I364b9d7c33e17986df3156dd59c359f111f05c00
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/lua/bindings/settings.cpp | 6 ++++--
 src/plugins/lua/meta/settings.lua     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/lua/bindings/settings.cpp b/src/plugins/lua/bindings/settings.cpp
index 03a29ded881..a2d0d22f0a4 100644
--- a/src/plugins/lua/bindings/settings.cpp
+++ b/src/plugins/lua/bindings/settings.cpp
@@ -553,8 +553,10 @@ void addSettingsModule()
                 setDisplayName(options.get<QString>("displayName"));
                 setCategory(Id::fromString(options.get<QString>("categoryId")));
                 setDisplayCategory(options.get<QString>("displayCategory"));
-                setCategoryIconPath(
-                    FilePath::fromUserInput(options.get<QString>("categoryIconPath")));
+                const FilePath catIcon = options.get<std::optional<FilePath>>("categoryIconPath")
+                                             .value_or(FilePath::fromUserInput(
+                                                 options.get_or<QString>("categoryIconPath", {})));
+                setCategoryIconPath(catIcon);
                 AspectContainer *container = options.get<AspectContainer *>("aspectContainer");
                 setSettingsProvider([container]() { return container; });
             }
diff --git a/src/plugins/lua/meta/settings.lua b/src/plugins/lua/meta/settings.lua
index 4a4cd3ee7d9..caa8a5301a2 100644
--- a/src/plugins/lua/meta/settings.lua
+++ b/src/plugins/lua/meta/settings.lua
@@ -202,7 +202,7 @@ settings.OptionsPage = {}
 ---@field displayName string
 ---@field categoryId string
 ---@field displayCategory string
----@field categoryIconPath string
+---@field categoryIconPath string|FilePath
 ---@field aspectContainer AspectContainer
 OptionsPageCreate = {}