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 <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
(cherry picked from commit 37cca63593fac4aff95e3f08a738451a81b87e20)
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

15 files changed, 36 insertions, 72 deletions

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 cf30f9c91c..2a2e1bd53d 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 6fd0637fb1..24434e0076 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 bb3e4851f9..2f59085569 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 104d349bcc..008e3eb995 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 d8758ca2bf..e385b58ff8 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 0661a77b7b..47fe3bd4e3 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 32acc1d817..0000000000
--- 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 0f9c24373c..ca8b45ede0 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
index a49600e270..a49600e270 100644
--- 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
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
index 71208c1808..71208c1808 100644
--- 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
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 8f451c8494..a0ec2f17cf 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 17eb0e92b3..0000000000
--- 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
index 8ebda6fb7e..8ebda6fb7e 100644
--- 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
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 d99371ee1d..b5924a433c 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 b1c8c5fb74..ec2164d4f2 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"
                 }
             ]