From 0c8dc6db00f349dd0f449141cfd4785d99a1ab52 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Thu, 21 Mar 2024 16:44:12 +0100
Subject: [PATCH] Wasm: Initialize resources and don't shadow name

e.g. the gallery has an own resource called "icons"

Resolves #409
---
 designsystems/fluent2/CMakeLists.txt                       | 2 +-
 designsystems/fluent2/{icons.qrc => QskFluent2Icons.qrc}   | 0
 designsystems/fluent2/QskFluent2Skin.cpp                   | 7 +++++++
 designsystems/material3/CMakeLists.txt                     | 2 +-
 .../material3/{icons.qrc => QskMaterial3Icons.qrc}         | 0
 designsystems/material3/QskMaterial3Skin.cpp               | 7 +++++++
 6 files changed, 16 insertions(+), 2 deletions(-)
 rename designsystems/fluent2/{icons.qrc => QskFluent2Icons.qrc} (100%)
 rename designsystems/material3/{icons.qrc => QskMaterial3Icons.qrc} (100%)

diff --git a/designsystems/fluent2/CMakeLists.txt b/designsystems/fluent2/CMakeLists.txt
index 2441647f..4fb73177 100644
--- a/designsystems/fluent2/CMakeLists.txt
+++ b/designsystems/fluent2/CMakeLists.txt
@@ -9,7 +9,7 @@ set(SOURCES
     QskFluent2Skin.h QskFluent2Skin.cpp
     QskFluent2SkinFactory.h QskFluent2SkinFactory.cpp
 )
-qt_add_resources(SOURCES icons.qrc)
+qt_add_resources(SOURCES QskFluent2Icons.qrc)
 
 qsk_add_plugin(fluent2skin skins QskFluent2SkinFactory ${SOURCES})
 set_target_properties(fluent2skin PROPERTIES DEFINE_SYMBOL QSK_FLUENT2_MAKEDLL )
diff --git a/designsystems/fluent2/icons.qrc b/designsystems/fluent2/QskFluent2Icons.qrc
similarity index 100%
rename from designsystems/fluent2/icons.qrc
rename to designsystems/fluent2/QskFluent2Icons.qrc
diff --git a/designsystems/fluent2/QskFluent2Skin.cpp b/designsystems/fluent2/QskFluent2Skin.cpp
index dc0fcd5b..993a3dcf 100644
--- a/designsystems/fluent2/QskFluent2Skin.cpp
+++ b/designsystems/fluent2/QskFluent2Skin.cpp
@@ -103,6 +103,13 @@
 #include <qguiapplication.h>
 #include <qfontinfo.h>
 
+static void qskFluent2InitResources()
+{
+    Q_INIT_RESOURCE( QskFluent2Icons );
+}
+
+Q_CONSTRUCTOR_FUNCTION( qskFluent2InitResources )
+
 namespace Fluent2
 {
     using F = QskFontRole;
diff --git a/designsystems/material3/CMakeLists.txt b/designsystems/material3/CMakeLists.txt
index cce742e0..051e8ed9 100644
--- a/designsystems/material3/CMakeLists.txt
+++ b/designsystems/material3/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SOURCES
     QskMaterial3Global.h QskMaterial3Skin.h QskMaterial3Skin.cpp
     QskMaterial3SkinFactory.h QskMaterial3SkinFactory.cpp
 )
-qt_add_resources(SOURCES icons.qrc)
+qt_add_resources(SOURCES QskMaterial3Icons.qrc)
 
 qsk_add_plugin(material3skin skins QskMaterial3SkinFactory ${SOURCES})
 set_target_properties(material3skin PROPERTIES DEFINE_SYMBOL QSK_MATERIAL3_MAKEDLL )
diff --git a/designsystems/material3/icons.qrc b/designsystems/material3/QskMaterial3Icons.qrc
similarity index 100%
rename from designsystems/material3/icons.qrc
rename to designsystems/material3/QskMaterial3Icons.qrc
diff --git a/designsystems/material3/QskMaterial3Skin.cpp b/designsystems/material3/QskMaterial3Skin.cpp
index 9e2835b4..b4664475 100644
--- a/designsystems/material3/QskMaterial3Skin.cpp
+++ b/designsystems/material3/QskMaterial3Skin.cpp
@@ -64,6 +64,13 @@
 #include <qguiapplication.h>
 #include <qfontinfo.h>
 
+static void qskMaterial3InitResources()
+{
+    Q_INIT_RESOURCE( QskMaterial3Icons );
+}
+
+Q_CONSTRUCTOR_FUNCTION( qskMaterial3InitResources )
+
 static const int qskDuration = 150;
 
 namespace