From 33edc4a8c90c03a681b2b0eb3c495d257c9a9c42 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Aug 2021 13:34:43 +0200 Subject: [PATCH] Fix display of unlinking button It was not being displayed with Qt 5.15 due to the following error: MaterialsView.qml:34:5: Unable to assign QStringList to QString This is correct. And it should not just concatenate all of these material names; it should add a comma between them for human-readable display in the text label above the button. Fixes #10235. --- resources/qml/Preferences/Materials/MaterialsView.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 489ff1f33e..2c68973e55 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -39,14 +39,14 @@ TabView } if (!base.containerId || !base.editingEnabled || !base.currentMaterialNode) { - return "" + return ""; } var linkedMaterials = Cura.ContainerManager.getLinkedMaterials(base.currentMaterialNode, true); if (linkedMaterials.length == 0) { - return "" + return ""; } - return linkedMaterials; + return linkedMaterials.join(", "); } function getApproximateDiameter(diameter)