forked from qt-creator/qt-creator
QmlDesigner: Fix project storage build
Change-Id: Id734a9618103e61778a772eeb460c7eeb031f076 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -356,8 +356,12 @@ void Edit3DView::handleEntriesChanged()
|
||||
append(model()->qtQuick3DOrthographicCameraMetaInfo(), EK_cameras);
|
||||
append(model()->qtQuick3DPerspectiveCameraMetaInfo(), EK_cameras);
|
||||
|
||||
auto assetsModule = model()->module(QmlDesignerPlugin::instance()->documentManager()
|
||||
.generatedComponentUtils().import3dTypePrefix());
|
||||
Utils::PathString import3dTypePrefix = QmlDesignerPlugin::instance()
|
||||
->documentManager()
|
||||
.generatedComponentUtils()
|
||||
.import3dTypePrefix();
|
||||
|
||||
auto assetsModule = model()->module(import3dTypePrefix);
|
||||
|
||||
for (const auto &metaInfo : model()->metaInfosForModule(assetsModule))
|
||||
append(metaInfo, EK_importedModels);
|
||||
|
@@ -766,10 +766,11 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent)
|
||||
QString fileName = QFileInfo(assetPath).baseName();
|
||||
fileName = fileName.at(0).toUpper() + fileName.mid(1); // capitalize first letter
|
||||
auto model = m_view->model();
|
||||
auto metaInfo = model->metaInfo(model->module(
|
||||
QmlDesignerPlugin::instance()->documentManager()
|
||||
.generatedComponentUtils().import3dTypePrefix()),
|
||||
fileName.toUtf8());
|
||||
Utils::PathString import3dTypePrefix = QmlDesignerPlugin::instance()
|
||||
->documentManager()
|
||||
.generatedComponentUtils()
|
||||
.import3dTypePrefix();
|
||||
auto metaInfo = model->metaInfo(model->module(import3dTypePrefix), fileName.toUtf8());
|
||||
if (auto entries = metaInfo.itemLibrariesEntries(); entries.size()) {
|
||||
auto entry = ItemLibraryEntry{entries.front(), *model->projectStorage()};
|
||||
QmlVisualNode::createQml3DNode(view(), entry, m_canvas->activeScene(), {}, false);
|
||||
|
@@ -182,7 +182,7 @@ void QmlModelNodeProxy::createModelNode(int internalIdParent,
|
||||
view->model()->changeImports({import}, {});
|
||||
|
||||
#ifdef QDS_USE_PROJECTSTORAGE
|
||||
ModelNode newNode = view->createModelNode(type);
|
||||
ModelNode newNode = view->createModelNode(typeName.toUtf8());
|
||||
#else
|
||||
NodeMetaInfo metaInfo = modelNode.model()->metaInfo(typeName.toUtf8());
|
||||
ModelNode newNode = view->createModelNode(metaInfo.typeName(),
|
||||
|
Reference in New Issue
Block a user