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: Ifdfefa6a9dc84c95b8fc9c9a06490325bb3584f9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Marco Bubke
2024-09-04 18:57:59 +02:00
parent 80ff1f90fd
commit 0a94c3214b
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/componentcore/bundlehelper.cpp
View File

@@ -48,7 +48,10 @@ void BundleHelper::createImporter()
m_importer = Utils::makeUniqueObjectPtr<BundleImporter>(); m_importer = Utils::makeUniqueObjectPtr<BundleImporter>();
#ifdef QDS_USE_PROJECTSTORAGE #ifdef QDS_USE_PROJECTSTORAGE
QObject::connect(m_importer, &BundleImporter::importFinished, m_widget, QObject::connect(
m_importer.get(),
&BundleImporter::importFinished,
m_widget,
[&](const QmlDesigner::TypeName &typeName, const QString &bundleId) { [&](const QmlDesigner::TypeName &typeName, const QString &bundleId) {
QTC_ASSERT(typeName.size(), return); QTC_ASSERT(typeName.size(), return);
if (isMaterialBundle(bundleId)) { if (isMaterialBundle(bundleId)) {

2
src/plugins/qmldesigner/components/componentcore/utils3d.cpp
View File

@@ -256,7 +256,7 @@ void applyMaterialToModels(AbstractView *view, const ModelNode &material,
#ifdef QDS_USE_PROJECTSTORAGE #ifdef QDS_USE_PROJECTSTORAGE
ModelNode createMaterial(AbstractView *view, const TypeName &typeName) ModelNode createMaterial(AbstractView *view, const TypeName &typeName)
{ {
ModelNode matLib = Utils3D::materialLibraryNode(this); ModelNode matLib = Utils3D::materialLibraryNode(view);
if (!matLib.isValid() || !typeName.size()) if (!matLib.isValid() || !typeName.size())
return {}; return {};

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

@@ -805,7 +805,7 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent)
auto moduleId = model->module(import3dTypePrefix, Storage::ModuleKind::QmlLibrary); auto moduleId = model->module(import3dTypePrefix, Storage::ModuleKind::QmlLibrary);
auto metaInfo = model->metaInfo(moduleId, fileName.toUtf8()); auto metaInfo = model->metaInfo(moduleId, fileName.toUtf8());
if (auto entries = metaInfo.itemLibrariesEntries(); entries.size()) { if (auto entries = metaInfo.itemLibrariesEntries(); entries.size()) {
auto entry = ItemLibraryEntry{entries.front()}; auto entry = ItemLibraryEntry::create(entries.front());
QmlVisualNode::createQml3DNode(view(), entry, m_canvas->activeScene(), {}, false); QmlVisualNode::createQml3DNode(view(), entry, m_canvas->activeScene(), {}, false);
} }
} }