From 24c2cd857d0143d4c1ba66bdbc44e44aeceb53fe Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Tue, 19 Dec 2023 13:09:14 +0200
Subject: [PATCH] Effect Maker: Store property display names when saving effect

Fixes: QDS-11345
Change-Id: Id948bf6474fcc6bfff0d6e2f14241c4e4e916f6a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
---
 src/plugins/effectmakernew/effectmakermodel.cpp | 3 +++
 src/plugins/effectmakernew/uniform.cpp          | 5 +++++
 src/plugins/effectmakernew/uniform.h            | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/plugins/effectmakernew/effectmakermodel.cpp b/src/plugins/effectmakernew/effectmakermodel.cpp
index c74fcd27cc3..4fcb6686a76 100644
--- a/src/plugins/effectmakernew/effectmakermodel.cpp
+++ b/src/plugins/effectmakernew/effectmakermodel.cpp
@@ -494,6 +494,9 @@ QJsonObject nodeToJson(const CompositionNode &node)
         QString type = Uniform::stringFromType(uniform->type());
         uniformObject.insert("type", type);
 
+        if (!uniform->displayName().isEmpty())
+            uniformObject.insert("displayName", QString(uniform->displayName()));
+
         QString value = variantAsDataString(uniform->type(), uniform->value());
         if (uniform->type() == Uniform::Type::Sampler)
             value = QFileInfo(value).fileName();
diff --git a/src/plugins/effectmakernew/uniform.cpp b/src/plugins/effectmakernew/uniform.cpp
index be10cc7f421..e9084f27991 100644
--- a/src/plugins/effectmakernew/uniform.cpp
+++ b/src/plugins/effectmakernew/uniform.cpp
@@ -114,6 +114,11 @@ QString Uniform::description() const
     return m_description;
 }
 
+QString Uniform::displayName() const
+{
+    return m_displayName;
+}
+
 QString Uniform::customValue() const
 {
     return m_customValue;
diff --git a/src/plugins/effectmakernew/uniform.h b/src/plugins/effectmakernew/uniform.h
index 7216c6d9d6b..2aa35d499d9 100644
--- a/src/plugins/effectmakernew/uniform.h
+++ b/src/plugins/effectmakernew/uniform.h
@@ -59,6 +59,7 @@ public:
 
     QString name() const;
     QString description() const;
+    QString displayName() const;
 
     QString customValue() const;
     void setCustomValue(const QString &newCustomValue);