From 0a94c3214b13e9ab4c5d80c212e31d2c19a7967b Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 4 Sep 2024 18:57:59 +0200 Subject: [PATCH] QmlDesigner: Fix project storage build Change-Id: Ifdfefa6a9dc84c95b8fc9c9a06490325bb3584f9 Reviewed-by: Mahmoud Badri --- .../qmldesigner/components/componentcore/bundlehelper.cpp | 5 ++++- src/plugins/qmldesigner/components/componentcore/utils3d.cpp | 2 +- src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/bundlehelper.cpp b/src/plugins/qmldesigner/components/componentcore/bundlehelper.cpp index 09d756365d3..0c3d52c081c 100644 --- a/src/plugins/qmldesigner/components/componentcore/bundlehelper.cpp +++ b/src/plugins/qmldesigner/components/componentcore/bundlehelper.cpp @@ -48,7 +48,10 @@ void BundleHelper::createImporter() m_importer = Utils::makeUniqueObjectPtr(); #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) { QTC_ASSERT(typeName.size(), return); if (isMaterialBundle(bundleId)) { diff --git a/src/plugins/qmldesigner/components/componentcore/utils3d.cpp b/src/plugins/qmldesigner/components/componentcore/utils3d.cpp index 6d0486131b5..7ddd0997cdf 100644 --- a/src/plugins/qmldesigner/components/componentcore/utils3d.cpp +++ b/src/plugins/qmldesigner/components/componentcore/utils3d.cpp @@ -256,7 +256,7 @@ void applyMaterialToModels(AbstractView *view, const ModelNode &material, #ifdef QDS_USE_PROJECTSTORAGE ModelNode createMaterial(AbstractView *view, const TypeName &typeName) { - ModelNode matLib = Utils3D::materialLibraryNode(this); + ModelNode matLib = Utils3D::materialLibraryNode(view); if (!matLib.isValid() || !typeName.size()) return {}; diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index 3bb04e2301c..8b28e4b55de 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -805,7 +805,7 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent) auto moduleId = model->module(import3dTypePrefix, Storage::ModuleKind::QmlLibrary); auto metaInfo = model->metaInfo(moduleId, fileName.toUtf8()); 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); } }