diff --git a/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp b/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp index 26f9b457aa3..7bd75751647 100644 --- a/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp +++ b/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp @@ -124,6 +124,9 @@ QString BundleImporter::importComponent(const QString &bundleDir, data.fullReset = doReset; Import import = Import::createLibraryImport(module, "1.0"); +#ifdef QDS_USE_PROJECTSTORAGE + model->changeImports({import}, {}); +#else if (!model->hasImport(import)) { if (model->possibleImports().contains(import)) { try { @@ -138,6 +141,7 @@ QString BundleImporter::importComponent(const QString &bundleDir, data.importToAdd = module; } } +#endif m_pendingImports.insert(type, data); m_importTimerCount = 0; m_importTimer.start(normalImportDelay); diff --git a/src/plugins/qmldesigner/components/componentcore/utils3d.cpp b/src/plugins/qmldesigner/components/componentcore/utils3d.cpp index e38fd544084..465514bbb6c 100644 --- a/src/plugins/qmldesigner/components/componentcore/utils3d.cpp +++ b/src/plugins/qmldesigner/components/componentcore/utils3d.cpp @@ -301,7 +301,7 @@ ModelNode createMaterial(AbstractView *view, const TypeName &typeName) matLib.defaultNodeListProperty().reparentHere(newMatNode); static QRegularExpression rgx("([A-Z])([a-z]*)"); - QString newName = QString::fromUtf8(typeName).replace(rgx, " \\1\\2").trimmed(); + QString newName = QString::fromUtf8(typeName.split('.').last()).replace(rgx, " \\1\\2").trimmed(); if (newName.endsWith(" Material")) newName.chop(9); // remove trailing " Material" QString newId = view->model()->generateNewId(newName, "material");