From 37cca63593fac4aff95e3f08a738451a81b87e20 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Wed, 29 Nov 2023 13:34:35 +0200 Subject: [PATCH] QmlDesigner: Cleanup the templates for DataStore - Fix the bug which disables the live preview - The singleton of the DataStore is defined once - Also modifies the template file formats of the DataStore files Fixes: QDS-11430 Change-Id: I67e0f64355dccdc32c031bb4dc0fb8edf3fdf64a Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Patch Build Bot --- .../projects/application-3d/wizard.json | 8 +++---- .../projects/application/wizard.json | 8 +++---- .../projects/desktop-launcher/wizard.json | 8 +++---- .../projects/mobile-scroll/wizard.json | 8 +++---- .../projects/mobile-stack/wizard.json | 8 +++---- .../projects/mobile-swipe/wizard.json | 8 +++---- .../projects/shared-plugin/name/DataStore.qml | 15 ------------ .../shared-plugin/name/DataStore.qml.tpl | 11 ++++++--- .../name/{JsonData.qml => JsonData.qml.tpl} | 0 .../name/{data.json => data.json.tpl} | 0 .../name/importmodule.qmldir.tpl | 1 - .../projects/shared-plugin/name/models.json | 24 ------------------- .../{DataStore.json.tpl => models.json.tpl} | 0 .../projects/shared-plugin/name/qmldir | 1 - .../projects/qtquickapplication/wizard.json | 8 +++---- 15 files changed, 36 insertions(+), 72 deletions(-) delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml rename share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/{JsonData.qml => JsonData.qml.tpl} (100%) rename share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/{data.json => data.json.tpl} (100%) delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/models.json rename share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/{DataStore.json.tpl => models.json.tpl} (100%) 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 cf30f9c91c7..2a2e1bd53d0 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json @@ -384,19 +384,19 @@ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" }, { - "source": "../shared-plugin/name/JsonData.qml", + "source": "../shared-plugin/name/JsonData.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml" }, { - "source": "../shared-plugin/name/DataStore.qml", + "source": "../shared-plugin/name/DataStore.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml" }, { - "source": "../shared-plugin/name/models.json", + "source": "../shared-plugin/name/models.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json" }, { - "source": "../shared-plugin/name/data.json", + "source": "../shared-plugin/name/data.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json" } ] diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json index 6fd0637fb1a..24434e00762 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json @@ -397,19 +397,19 @@ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" }, { - "source": "../shared-plugin/name/JsonData.qml", + "source": "../shared-plugin/name/JsonData.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml" }, { - "source": "../shared-plugin/name/DataStore.qml", + "source": "../shared-plugin/name/DataStore.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml" }, { - "source": "../shared-plugin/name/models.json", + "source": "../shared-plugin/name/models.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json" }, { - "source": "../shared-plugin/name/data.json", + "source": "../shared-plugin/name/data.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json" } ] 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 bb3e4851f9c..2f590855690 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json @@ -384,19 +384,19 @@ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" }, { - "source": "../shared-plugin/name/JsonData.qml", + "source": "../shared-plugin/name/JsonData.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml" }, { - "source": "../shared-plugin/name/DataStore.qml", + "source": "../shared-plugin/name/DataStore.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml" }, { - "source": "../shared-plugin/name/models.json", + "source": "../shared-plugin/name/models.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json" }, { - "source": "../shared-plugin/name/data.json", + "source": "../shared-plugin/name/data.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json" } ] 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 104d349bccf..008e3eb9952 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json @@ -343,19 +343,19 @@ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" }, { - "source": "../shared-plugin/name/JsonData.qml", + "source": "../shared-plugin/name/JsonData.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml" }, { - "source": "../shared-plugin/name/DataStore.qml", + "source": "../shared-plugin/name/DataStore.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml" }, { - "source": "../shared-plugin/name/models.json", + "source": "../shared-plugin/name/models.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json" }, { - "source": "../shared-plugin/name/data.json", + "source": "../shared-plugin/name/data.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json" } ] 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 d8758ca2bf1..e385b58ff8f 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json @@ -345,19 +345,19 @@ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" }, { - "source": "../shared-plugin/name/JsonData.qml", + "source": "../shared-plugin/name/JsonData.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml" }, { - "source": "../shared-plugin/name/DataStore.qml", + "source": "../shared-plugin/name/DataStore.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml" }, { - "source": "../shared-plugin/name/models.json", + "source": "../shared-plugin/name/models.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json" }, { - "source": "../shared-plugin/name/data.json", + "source": "../shared-plugin/name/data.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json" } ] 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 0661a77b7b6..47fe3bd4e3d 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json @@ -345,19 +345,19 @@ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" }, { - "source": "../shared-plugin/name/JsonData.qml", + "source": "../shared-plugin/name/JsonData.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml" }, { - "source": "../shared-plugin/name/DataStore.qml", + "source": "../shared-plugin/name/DataStore.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml" }, { - "source": "../shared-plugin/name/models.json", + "source": "../shared-plugin/name/models.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json" }, { - "source": "../shared-plugin/name/data.json", + "source": "../shared-plugin/name/data.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json" } ] diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml deleted file mode 100644 index 32acc1d8178..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml +++ /dev/null @@ -1,15 +0,0 @@ -pragma Singleton -import QtQuick 6.5 -import QtQuick.Studio.Utils 1.0 - -JsonListModel { - id: models - source: Qt.resolvedUrl("models.json") - - property ChildListModel exampleModel: ChildListModel { - modelName: "exampleModel" - } - - property JsonData backend: JsonData {} -} - diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml.tpl index 0f9c24373c7..ca8b45ede08 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml.tpl @@ -2,11 +2,16 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only pragma Singleton -import QtQuick.Studio.Utils +import QtQuick 6.5 +import QtQuick.Studio.Utils 1.0 JsonListModel { - property alias allModels: models id: models + source: Qt.resolvedUrl("models.json") - source: Qt.resolvedUrl("DataStore.json") + property ChildListModel book: ChildListModel { + modelName: "book" + } + + property JsonData backend: JsonData {} } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/JsonData.qml b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/JsonData.qml.tpl similarity index 100% rename from share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/JsonData.qml rename to share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/JsonData.qml.tpl diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/data.json b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/data.json.tpl similarity index 100% rename from share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/data.json rename to share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/data.json.tpl diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl index 8f451c8494d..a0ec2f17cfc 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl @@ -4,4 +4,3 @@ singleton Constants 1.0 Constants.qml EventListSimulator 1.0 EventListSimulator.qml EventListModel 1.0 EventListModel.qml DirectoryFontLoader 1.0 DirectoryFontLoader.qml -singleton DataStore 1.0 DataStore.qml diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/models.json b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/models.json deleted file mode 100644 index 17eb0e92b3f..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/models.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "exampleModel": [ - { - "name": "Christen Anderson", - "number": "+3455641" - }, - { - "name": "Armanda Cox", - "number": "+21155641" - }, - { - "name": "Ken Garza", - "number": "+3288642" - }, - { - "name": "Rodney Hamilton", - "number": "+3558848" - }, - { - "name": "Andrew Battles", - "number": "+42488649" - } - ] -} diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.json.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/models.json.tpl similarity index 100% rename from share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.json.tpl rename to share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/models.json.tpl diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir index d99371ee1da..b5924a433cc 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir +++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir @@ -3,4 +3,3 @@ singleton DataStore 1.0 DataStore.qml EventListModel 1.0 EventListModel.qml EventListSimulator 1.0 EventListSimulator.qml DirectoryFontLoader 1.0 DirectoryFontLoader.qml -singleton DataStore 1.0 DataStore.qml diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json index b1c8c5fb74f..ec2164d4f26 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json @@ -263,19 +263,19 @@ "condition": "%{QdsProjectStyle}" }, { - "source": "../shared-plugin/name/JsonData.qml", + "source": "../shared-plugin/name/JsonData.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml" }, { - "source": "../shared-plugin/name/DataStore.qml", + "source": "../shared-plugin/name/DataStore.qml.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml" }, { - "source": "../shared-plugin/name/models.json", + "source": "../shared-plugin/name/models.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json" }, { - "source": "../shared-plugin/name/data.json", + "source": "../shared-plugin/name/data.json.tpl", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json" } ]