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

QmlDesigner: Fix content lib crash when node has no id

Browse Source 
Crash happens when adding a node with no id to the content library.
Also improved the default name in such cases to be the type instead
of the generic name "component" (using the existing node.displayName()
method).

Change-Id: I9b5745dc421dfa7f58afec185555ebb8e1ff4b71
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2024-06-12 20:25:06 +03:00
parent c93f96406e
commit 0506a6c199
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp
View File

@@ -317,6 +317,9 @@ QPair<QString, QString> ContentLibraryUserModel::getUniqueLibItemNames(const QSt
const QJsonObject &bundleObj) const
{
QString uniqueQml = UniqueName::generateId(defaultName);
if (uniqueQml.isEmpty())
uniqueQml = "Component";
else
uniqueQml[0] = uniqueQml.at(0).toUpper();
uniqueQml.prepend("My");

15
src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
View File

@@ -524,7 +524,10 @@ void ContentLibraryView::addLibMaterial(const ModelNode &node, const QPixmap &ic
auto bundlePath = Utils::FilePath::fromString(Paths::bundlesPathSetting() + "/User/materials/");
QString name = node.variantProperty("objectName").value().toString();
auto [qml, icon] = m_widget->userModel()->getUniqueLibMaterialNames(node.id());
if (name.isEmpty())
name = node.displayName();
auto [qml, icon] = m_widget->userModel()->getUniqueLibMaterialNames(name);
QString iconPath = QLatin1String("icons/%1").arg(icon);
QString fullIconPath = bundlePath.pathAppended(iconPath).toFSPathString();
@@ -828,9 +831,9 @@ void ContentLibraryView::addLib3DItem(const ModelNode &node)
QString name = node.variantProperty("objectName").value().toString();
if (name.isEmpty())
name = node.id();
name = node.displayName();
auto [qml, icon] = m_widget->userModel()->getUniqueLibItemNames(node.id(),
auto [qml, icon] = m_widget->userModel()->getUniqueLibItemNames(name,
m_widget->userModel()->bundleJson3DObjectRef());
// generate and save Qml file
@@ -884,8 +887,8 @@ void ContentLibraryView::addLib3DItem(const ModelNode &node)
QString ContentLibraryView::getExportPath(const ModelNode &node) const
{
QString defaultName = node.hasId() ? node.id() : "component";
QString defaultExportFileName = QLatin1String("%1.%2").arg(defaultName, Constants::BUNDLE_SUFFIX);
QString defaultExportFileName = QLatin1String("%1.%2").arg(node.displayName(),
Constants::BUNDLE_SUFFIX);
Utils::FilePath projectFP = DocumentManager::currentProjectDirPath();
if (projectFP.isEmpty()) {
projectFP = QmlDesignerPlugin::instance()->documentManager()
@@ -927,7 +930,7 @@ void ContentLibraryView::exportLib3DItem(const ModelNode &node, const QPixmap &i
QString name = node.variantProperty("objectName").value().toString();
if (name.isEmpty())
name = node.hasId() ? node.id() : "component";
name = node.displayName();
auto [qml, icon] = m_widget->userModel()->getUniqueLibItemNames(name);