diff --git a/sources/diagram.cpp b/sources/diagram.cpp
index 3e32ea109..6cccf6e56 100644
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -1093,9 +1093,21 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 	if (content_ptr) {
 		content_ptr -> m_elements           = added_elements;
 		content_ptr -> m_conductors_to_move = added_conductors;
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
 		content_ptr -> m_text_fields        = added_texts.toSet();
 		content_ptr -> m_images			    = added_images.toSet();
 		content_ptr -> m_shapes			    = added_shapes.toSet();
+#else
+		content_ptr -> m_text_fields	= QSet<IndependentTextItem *>(
+					added_texts.begin(),
+					added_texts.end());
+		content_ptr -> m_images		= QSet<DiagramImageItem *>(
+					added_images.begin(),
+					added_images.end());
+		content_ptr -> m_shapes		= QSet<QetShapeItem *>(
+					added_shapes.begin(),
+					added_shapes.end());
+#endif
 		content_ptr -> m_tables             = added_tables;
 	}
 
diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp
index c58dca881..0c2ad3031 100644
--- a/sources/qetgraphicsitem/conductor.cpp
+++ b/sources/qetgraphicsitem/conductor.cpp
@@ -1639,7 +1639,11 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
 			for (Conductor *c : other_conductors_list_t) {
 				other_conductors += c->relatedPotentialConductors(all_diagram, t_list);
 			}
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
 			other_conductors += other_conductors_list_t.toSet();
+#else
+			other_conductors += QSet<Conductor*>(other_conductors_list_t.begin(),other_conductors_list_t.end());
+#endif
 		}
 	}