kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-21 04:19:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove several QT_VERSION_CHECK

Browse Source 
Remove several QT_VERSION_CHECK related to Qt5 and Qt4.
This commit is contained in:
joshua
2026-03-19 19:54:51 +01:00
parent 1ba97c7e92
commit 0b91318749
29 changed files with 13 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources/diagram.cpp
View File

@@ -1514,14 +1514,6 @@ bool Diagram::fromXml(QDomElement &document,
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
#if TODO_LIST
#pragma message("@TODO remove code for QT 5.14 or later")
#endif
content_ptr -> m_text_fields = QSet<IndependentTextItem *>(
added_texts.begin(),
added_texts.end());
@@ -1532,7 +1524,6 @@ bool Diagram::fromXml(QDomElement &document,
added_shapes.begin(),
added_shapes.end());
content_ptr->m_terminal_strip.swap(added_strips);
#endif
content_ptr->m_tables.swap(added_tables);
}