From 74222a76f47ba0bc463c765af237cd5ccb28f722 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 8 Sep 2023 10:29:15 +0200
Subject: [PATCH] QmlDesigner: Add QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT in
 qml2puppet

Task-number: QDS-10255
Change-Id: I6d9698a77c1dfae9345d70a1edb40210d17c4ba7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/plugins/qmldesigner/puppetenvironmentbuilder.cpp | 6 ++++++
 src/plugins/qmldesigner/puppetenvironmentbuilder.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
index fbf76b96630..f0545adadba 100644
--- a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
+++ b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
@@ -52,6 +52,7 @@ QProcessEnvironment PuppetEnvironmentBuilder::processEnvironment() const
     addImportPaths();
     addCustomFileSelectors();
     addDisableDeferredProperties();
+    addResolveUrlsOnAssignment();
 
     qCInfo(puppetEnvirmentBuild) << "Puppet environment:" << m_environment.toStringList();
 
@@ -250,6 +251,11 @@ void PuppetEnvironmentBuilder::addDisableDeferredProperties() const
     m_environment.set("QML_DISABLE_INTERNAL_DEFERRED_PROPERTIES", "true");
 }
 
+void PuppetEnvironmentBuilder::addResolveUrlsOnAssignment() const
+{
+    m_environment.set("QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT", "true");
+}
+
 PuppetType PuppetEnvironmentBuilder::determinePuppetType() const
 {
     if (m_target && m_target->kit() && m_target->kit()->isValid()) {
diff --git a/src/plugins/qmldesigner/puppetenvironmentbuilder.h b/src/plugins/qmldesigner/puppetenvironmentbuilder.h
index 3c2ffba271e..8179a36b90d 100644
--- a/src/plugins/qmldesigner/puppetenvironmentbuilder.h
+++ b/src/plugins/qmldesigner/puppetenvironmentbuilder.h
@@ -50,6 +50,7 @@ private:
     void addImportPaths() const;
     void addCustomFileSelectors() const;
     void addDisableDeferredProperties() const;
+    void addResolveUrlsOnAssignment() const;
 
 private:
     ProjectExplorer::Target *m_target = nullptr;