kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-30 15:39:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'qelectrotech:qt6-cmake' into qt6-cmake

Browse Source
This commit is contained in:
elevatormind
2025-03-03 19:48:57 +01:00
committed by GitHub
parent d4972dc588 d7a15d6cb6
commit 01d018f8cf
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/qetgraphicsitem/element.cpp
View File

@@ -765,14 +765,14 @@ bool Element::fromXml(QDomElement &e,
QList <QDomElement> uuid_list = QET::findInDomElement(e,
QStringLiteral("links_uuids"),
QStringLiteral("link_uuid"));
foreach (QDomElement qdo, uuid_list)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
foreach (QDomElement qdo, uuid_list)
tmp_uuids_link << qdo.attribute(QStringLiteral("uuid"));
#else
#if TODO_LIST
#pragma message("@TODO remove code for QT 6 or later")
#endif
qDebug()<<"Help code for QT 6 or later";
foreach (QDomElement qdo, uuid_list) {
tmp_uuids_link << QUuid(qdo.attribute(QStringLiteral("uuid")));
}
qInfo() << "tmp_uuids_link: " << tmp_uuids_link;
#endif
//uuid of this element
m_uuid = QUuid(e.attribute(QStringLiteral("uuid"), QUuid::createUuid().toString()));