feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT in qml2puppet

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2023-09-08 10:29:15 +02:00
parent 6c17805ddc
commit 74222a76f4
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
View File

@@ -52,6 +52,7 @@ QProcessEnvironment PuppetEnvironmentBuilder::processEnvironment() const
addImportPaths(); addImportPaths();
addCustomFileSelectors(); addCustomFileSelectors();
addDisableDeferredProperties(); addDisableDeferredProperties();
addResolveUrlsOnAssignment();
qCInfo(puppetEnvirmentBuild) << "Puppet environment:" << m_environment.toStringList(); qCInfo(puppetEnvirmentBuild) << "Puppet environment:" << m_environment.toStringList();
@@ -250,6 +251,11 @@ void PuppetEnvironmentBuilder::addDisableDeferredProperties() const
m_environment.set("QML_DISABLE_INTERNAL_DEFERRED_PROPERTIES", "true"); 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 PuppetType PuppetEnvironmentBuilder::determinePuppetType() const
{ {
if (m_target && m_target->kit() && m_target->kit()->isValid()) { if (m_target && m_target->kit() && m_target->kit()->isValid()) {

1
src/plugins/qmldesigner/puppetenvironmentbuilder.h
View File

@@ -50,6 +50,7 @@ private:
void addImportPaths() const; void addImportPaths() const;
void addCustomFileSelectors() const; void addCustomFileSelectors() const;
void addDisableDeferredProperties() const; void addDisableDeferredProperties() const;
void addResolveUrlsOnAssignment() const;
private: private:
ProjectExplorer::Target *m_target = nullptr; ProjectExplorer::Target *m_target = nullptr;