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

QmlDesigner: Fix project storage build

Browse Source 
Change-Id: Id734a9618103e61778a772eeb460c7eeb031f076
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2024-04-15 15:41:25 +02:00
committed by Tim Jenssen
parent 401bbae862
commit 8694de43c0
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -356,8 +356,12 @@ void Edit3DView::handleEntriesChanged()
append(model()->qtQuick3DOrthographicCameraMetaInfo(), EK_cameras); append(model()->qtQuick3DOrthographicCameraMetaInfo(), EK_cameras);
append(model()->qtQuick3DPerspectiveCameraMetaInfo(), EK_cameras); append(model()->qtQuick3DPerspectiveCameraMetaInfo(), EK_cameras);
auto assetsModule = model()->module(QmlDesignerPlugin::instance()->documentManager() Utils::PathString import3dTypePrefix = QmlDesignerPlugin::instance()
.generatedComponentUtils().import3dTypePrefix()); ->documentManager()
.generatedComponentUtils()
.import3dTypePrefix();
auto assetsModule = model()->module(import3dTypePrefix);
for (const auto &metaInfo : model()->metaInfosForModule(assetsModule)) for (const auto &metaInfo : model()->metaInfosForModule(assetsModule))
append(metaInfo, EK_importedModels); append(metaInfo, EK_importedModels);

9
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -766,10 +766,11 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent)
QString fileName = QFileInfo(assetPath).baseName(); QString fileName = QFileInfo(assetPath).baseName();
fileName = fileName.at(0).toUpper() + fileName.mid(1); // capitalize first letter fileName = fileName.at(0).toUpper() + fileName.mid(1); // capitalize first letter
auto model = m_view->model(); auto model = m_view->model();
auto metaInfo = model->metaInfo(model->module( Utils::PathString import3dTypePrefix = QmlDesignerPlugin::instance()
QmlDesignerPlugin::instance()->documentManager() ->documentManager()
.generatedComponentUtils().import3dTypePrefix()), .generatedComponentUtils()
fileName.toUtf8()); .import3dTypePrefix();
auto metaInfo = model->metaInfo(model->module(import3dTypePrefix), fileName.toUtf8());
if (auto entries = metaInfo.itemLibrariesEntries(); entries.size()) { if (auto entries = metaInfo.itemLibrariesEntries(); entries.size()) {
auto entry = ItemLibraryEntry{entries.front(), *model->projectStorage()}; auto entry = ItemLibraryEntry{entries.front(), *model->projectStorage()};
QmlVisualNode::createQml3DNode(view(), entry, m_canvas->activeScene(), {}, false); QmlVisualNode::createQml3DNode(view(), entry, m_canvas->activeScene(), {}, false);

2
src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp
View File

@@ -182,7 +182,7 @@ void QmlModelNodeProxy::createModelNode(int internalIdParent,
view->model()->changeImports({import}, {}); view->model()->changeImports({import}, {});
#ifdef QDS_USE_PROJECTSTORAGE #ifdef QDS_USE_PROJECTSTORAGE
ModelNode newNode = view->createModelNode(type); ModelNode newNode = view->createModelNode(typeName.toUtf8());
#else #else
NodeMetaInfo metaInfo = modelNode.model()->metaInfo(typeName.toUtf8()); NodeMetaInfo metaInfo = modelNode.model()->metaInfo(typeName.toUtf8());
ModelNode newNode = view->createModelNode(metaInfo.typeName(), ModelNode newNode = view->createModelNode(metaInfo.typeName(),