From c0b7b4646fd1563fabd360b51efd0e3adb56f067 Mon Sep 17 00:00:00 2001
From: Aleksei German <aleksei.german@qt.io>
Date: Mon, 10 Jun 2024 17:54:54 +0200
Subject: [PATCH] QmlDesigner: Fix for MCUs project template

Task-number: QDS-11602
Change-Id: I3d19bee208cef0638ca73ca3b1371b39f2a4f01c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../projects/application-mcu/app_mcu.qmlproject.tpl    |  8 ++++++++
 .../projects/application-mcu/assets.txt                |  1 +
 .../projects/application-mcu/images.txt                |  1 +
 .../projects/application-mcu/wizard.json               | 10 +++++++++-
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/assets.txt
 create mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/images.txt

diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/app_mcu.qmlproject.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/app_mcu.qmlproject.tpl
index 7c4453752a6..b75781c1cf8 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/app_mcu.qmlproject.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/app_mcu.qmlproject.tpl
@@ -19,6 +19,14 @@ Project {
         directory: "."
     }
 
+    ImageFiles {
+        directory: "images"
+    }
+
+    ImageFiles {
+        directory: "assets"
+    }
+
     Files {
        filter: "*.conf"
        files: ["qtquickcontrols2.conf"]
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/assets.txt b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/assets.txt
new file mode 100644
index 00000000000..d43160aeb4b
--- /dev/null
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/assets.txt
@@ -0,0 +1 @@
+Image assets generated by Bridge in this folder are loaded automatically.
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/images.txt b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/images.txt
new file mode 100644
index 00000000000..38ad142bc42
--- /dev/null
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/images.txt
@@ -0,0 +1 @@
+Images in this folder are loaded automatically.
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json
index 01baa5f9760..9ac1d9519d5 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json
@@ -174,9 +174,17 @@
                     "target": "%{ProjectDirectory}/CMakeLists.txt"
                 },
                 {
-                    "source": "../fonts.txt",
+                    "source": "../common/fonts.txt",
                     "target": "%{ProjectDirectory}/fonts/fonts.txt"
                 },
+                {
+                    "source": "images.txt",
+                    "target": "%{ProjectDirectory}/images/images.txt"
+                },
+                {
+                    "source": "assets.txt",
+                    "target": "%{ProjectDirectory}/assets/assets.txt"
+                },
                 {
                     "source": "mcuqtquickcontrols2.conf",
                     "target": "%{ProjectDirectory}/qtquickcontrols2.conf"