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

QmlDesigner: Create DataStore on demand

Browse Source 
Task-number: QDS-11708
Change-Id: Ie08ab6260a1b720640c2c85f4b49b8093ec622d8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Ali Kianian
2024-01-19 13:40:48 +02:00
parent 1b4a79ad92
commit 1aee25bbc2
11 changed files with 10 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
View File

@@ -382,22 +382,6 @@
{ {
"source": "../shared-plugin/name/designer/plugin.metainfo", "source": "../shared-plugin/name/designer/plugin.metainfo",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
},
{
"source": "../shared-plugin/name/JsonData.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
},
{
"source": "../shared-plugin/name/DataStore.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
},
{
"source": "../shared-plugin/name/models.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
},
{
"source": "../shared-plugin/name/data.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
} }
] ]
} }

16
share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
View File

@@ -395,22 +395,6 @@
{ {
"source": "../shared-plugin/name/designer/plugin.metainfo", "source": "../shared-plugin/name/designer/plugin.metainfo",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
},
{
"source": "../shared-plugin/name/JsonData.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
},
{
"source": "../shared-plugin/name/DataStore.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
},
{
"source": "../shared-plugin/name/models.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
},
{
"source": "../shared-plugin/name/data.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
} }
] ]
} }

16
share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
View File

@@ -382,22 +382,6 @@
{ {
"source": "../shared-plugin/name/designer/plugin.metainfo", "source": "../shared-plugin/name/designer/plugin.metainfo",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
},
{
"source": "../shared-plugin/name/JsonData.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
},
{
"source": "../shared-plugin/name/DataStore.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
},
{
"source": "../shared-plugin/name/models.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
},
{
"source": "../shared-plugin/name/data.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
} }
] ]
} }

16
share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
View File

@@ -341,22 +341,6 @@
{ {
"source": "../shared-plugin/name/designer/plugin.metainfo", "source": "../shared-plugin/name/designer/plugin.metainfo",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
},
{
"source": "../shared-plugin/name/JsonData.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
},
{
"source": "../shared-plugin/name/DataStore.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
},
{
"source": "../shared-plugin/name/models.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
},
{
"source": "../shared-plugin/name/data.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
} }
] ]
} }

16
share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
View File

@@ -343,22 +343,6 @@
{ {
"source": "../shared-plugin/name/designer/plugin.metainfo", "source": "../shared-plugin/name/designer/plugin.metainfo",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
},
{
"source": "../shared-plugin/name/JsonData.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
},
{
"source": "../shared-plugin/name/DataStore.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
},
{
"source": "../shared-plugin/name/models.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
},
{
"source": "../shared-plugin/name/data.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
} }
] ]
} }

16
share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
View File

@@ -343,22 +343,6 @@
{ {
"source": "../shared-plugin/name/designer/plugin.metainfo", "source": "../shared-plugin/name/designer/plugin.metainfo",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
},
{
"source": "../shared-plugin/name/JsonData.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
},
{
"source": "../shared-plugin/name/DataStore.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
},
{
"source": "../shared-plugin/name/models.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
},
{
"source": "../shared-plugin/name/data.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
} }
] ]
} }

5
share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/CMakeLists.importmodule.txt.tpl
View File

@@ -13,12 +13,7 @@ qt6_add_qml_module(%{ImportModuleName}
RESOURCE_PREFIX "/qt/qml" RESOURCE_PREFIX "/qt/qml"
QML_FILES QML_FILES
Constants.qml Constants.qml
DataStore.qml
DirectoryFontLoader.qml DirectoryFontLoader.qml
EventListModel.qml EventListModel.qml
EventListSimulator.qml EventListSimulator.qml
JsonData.qml
RESOURCES
data.json
models.json
) )

1
share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl
View File

@@ -1,5 +1,4 @@
Module %{ImportModuleName} Module %{ImportModuleName}
singleton DataStore 1.0 DataStore.qml
singleton Constants 1.0 Constants.qml singleton Constants 1.0 Constants.qml
EventListSimulator 1.0 EventListSimulator.qml EventListSimulator 1.0 EventListSimulator.qml
EventListModel 1.0 EventListModel.qml EventListModel 1.0 EventListModel.qml

1
share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir
View File

@@ -1,5 +1,4 @@
singleton Constants 1.0 Constants.qml singleton Constants 1.0 Constants.qml
singleton DataStore 1.0 DataStore.qml
EventListModel 1.0 EventListModel.qml EventListModel 1.0 EventListModel.qml
EventListSimulator 1.0 EventListSimulator.qml EventListSimulator 1.0 EventListSimulator.qml
DirectoryFontLoader 1.0 DirectoryFontLoader.qml DirectoryFontLoader 1.0 DirectoryFontLoader.qml

16
share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
View File

@@ -261,22 +261,6 @@
"source": "%{QdsWizardPath}/shared-plugin/name/designer/plugin.metainfo", "source": "%{QdsWizardPath}/shared-plugin/name/designer/plugin.metainfo",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo", "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo",
"condition": "%{QdsProjectStyle}" "condition": "%{QdsProjectStyle}"
},
{
"source": "../shared-plugin/name/JsonData.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
},
{
"source": "../shared-plugin/name/DataStore.qml.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
},
{
"source": "../shared-plugin/name/models.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
},
{
"source": "../shared-plugin/name/data.json.tpl",
"target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
} }
] ]
} }

14
src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
View File

@@ -7,14 +7,14 @@
#include "nodemetainfo.h" #include "nodemetainfo.h"
#include "propertymetainfo.h" #include "propertymetainfo.h"
#include <variant>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/qtcassert.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectmanager.h> #include <projectexplorer/projectmanager.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <utils/qtcassert.h>
#include <variant>
#include <QColor> #include <QColor>
#include <QJsonArray> #include <QJsonArray>
@@ -290,6 +290,12 @@ bool ensureDataStoreExists(bool &justCreated)
if (qmlDirSaver.finalize()) { if (qmlDirSaver.finalize()) {
justCreated = true; justCreated = true;
// Force code model reset to notice changes to existing module
auto modelManager = QmlJS::ModelManagerInterface::instance();
if (modelManager)
modelManager->resetCodeModel();
return true; return true;
} }