aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2022-10-25 11:04:16 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2022-10-25 09:11:07 +0000
commit0e7bb804084e2c32a5d4074ccc2deceb0ad07f80 (patch)
tree6a3859bd0f9ee5c68b6570f71f803938fceae6ae
parentccb03494537f66862188d5ef7c256c0625edabfe (diff)
QmlDesigner: Use QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT
At least for now this is the better default for QDS. See also for example the SafeRenderer items. Task-number: QDS-4812 Change-Id: I03d614ec52c1e5ab11576bbfdaa3bad0d72f0fbf Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl1
-rw-r--r--share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl1
2 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
index 206d8272da..4031ba86a5 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
@@ -71,6 +71,7 @@ Project {
Environment {
QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf"
QT_AUTO_SCREEN_SCALE_FACTOR: "1"
+ QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT: "1"
@if %{IsQt6Project}
@else
QMLSCENE_CORE_PROFILE: "true" // Required for macOS, but can create issues on embedded Linux
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl
index e25a370c04..e1f7ec2e23 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl
@@ -15,4 +15,5 @@ void set_qt_environment()
qputenv("QT_ENABLE_HIGHDPI_SCALING", "0");
qputenv("QT_LOGGING_RULES", "qt.qml.connections=false");
qputenv("QT_QUICK_CONTROLS_CONF", ":/qtquickcontrols2.conf");
+ qputenv("QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT", "1");
}