From fdf1baecd627c48370df1687d2c486c154d4aefd Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Oct 2022 12:53:01 +0300 Subject: [PATCH] QmlDesigner: Create asset_imports directory at project creation Some watchers won't be initialized correctly if the folder doesn't exist at project startup. E.g. texture images won't appear in project view when material with textures is imported, unless asset_imports already exists at project load. Task-number: QDS-7813 Change-Id: I79449ae823d9005e74594f08bfa87abf44045caf Reviewed-by: Thomas Hartmann Reviewed-by: Reviewed-by: Eike Ziller --- .../studio_templates/projects/application-3d/wizard.json | 4 ++++ .../studio_templates/projects/application/wizard.json | 4 ++++ .../studio_templates/projects/common/asset_imports.txt | 1 + .../studio_templates/projects/desktop-launcher/wizard.json | 4 ++++ .../studio_templates/projects/mobile-scroll/wizard.json | 4 ++++ .../studio_templates/projects/mobile-stack/wizard.json | 4 ++++ .../studio_templates/projects/mobile-swipe/wizard.json | 4 ++++ 7 files changed, 25 insertions(+) create mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/asset_imports.txt diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json index 9d60367997a..3510d3e190b 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json @@ -328,6 +328,10 @@ "source": "../common/fonts.txt", "target": "%{ProjectDirectory}/content/fonts/fonts.txt" }, + { + "source": "../common/asset_imports.txt", + "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" + }, { "source": "../common/CMakeLists.imports.txt.tpl", "target": "%{ProjectDirectory}/imports/CMakeLists.txt" diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json index 6912200c14b..68ffb6cff17 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json @@ -324,6 +324,10 @@ "source": "../common/fonts.txt", "target": "%{ProjectDirectory}/content/fonts/fonts.txt" }, + { + "source": "../common/asset_imports.txt", + "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" + }, { "source": "../common/CMakeLists.imports.txt.tpl", "target": "%{ProjectDirectory}/imports/CMakeLists.txt" diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/asset_imports.txt b/share/qtcreator/qmldesigner/studio_templates/projects/common/asset_imports.txt new file mode 100644 index 00000000000..84c843f100d --- /dev/null +++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/asset_imports.txt @@ -0,0 +1 @@ +Imported 3D assets and components imported from bundles will be created in this folder. diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json index 20a3baba9c7..ab1830752b1 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json @@ -323,6 +323,10 @@ "source": "../common/fonts.txt", "target": "%{ProjectDirectory}/content/fonts/fonts.txt" }, + { + "source": "../common/asset_imports.txt", + "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" + }, { "source": "../common/CMakeLists.imports.txt.tpl", "target": "%{ProjectDirectory}/imports/CMakeLists.txt" diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json index 3117c7e0544..1a9e07cb63c 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json @@ -280,6 +280,10 @@ "source": "../common/fonts.txt", "target": "%{ProjectDirectory}/content/fonts/fonts.txt" }, + { + "source": "../common/asset_imports.txt", + "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" + }, { "source": "../common/CMakeLists.imports.txt.tpl", "target": "%{ProjectDirectory}/imports/CMakeLists.txt" diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json index cb083e84f4b..2e07c4725a1 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json @@ -284,6 +284,10 @@ "source": "../common/fonts.txt", "target": "%{ProjectDirectory}/content/fonts/fonts.txt" }, + { + "source": "../common/asset_imports.txt", + "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" + }, { "source": "../common/CMakeLists.imports.txt.tpl", "target": "%{ProjectDirectory}/imports/CMakeLists.txt" diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json index 1c1137afddb..422db173497 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json @@ -284,6 +284,10 @@ "source": "../common/fonts.txt", "target": "%{ProjectDirectory}/content/fonts/fonts.txt" }, + { + "source": "../common/asset_imports.txt", + "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" + }, { "source": "../common/CMakeLists.imports.txt.tpl", "target": "%{ProjectDirectory}/imports/CMakeLists.txt"