realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Merge pull request #377 from plc-user/master

Browse Source 
same simplifications as in #376 "use the same code for Qt5 & Qt6"
This commit is contained in:
Laurent Trinques 2025-03-04 15:09:20 +01:00 committed by GitHub
commit a1572be8fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sources/qetgraphicsitem/conductor.cpp
View File

@ -520,14 +520,7 @@ void Conductor::paint(QPainter *painter, const QStyleOptionGraphicsItem *options
final_conductor_pen.setJoinStyle(Qt::SvgMiterJoin); // better rendering with dot final_conductor_pen.setJoinStyle(Qt::SvgMiterJoin); // better rendering with dot
//Use a cosmetique line, below a certain zoom //Use a cosmetique line, below a certain zoom
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
if (options && options -> levelOfDetail < 1.0)
#else
#if TODO_LIST
#pragma message("@TODO remove code for QT 6 or later")
#endif
if (options && options->levelOfDetailFromTransform(painter->worldTransform()) < 1.0) if (options && options->levelOfDetailFromTransform(painter->worldTransform()) < 1.0)
#endif
{ {
final_conductor_pen.setCosmetic(true); final_conductor_pen.setCosmetic(true);
} }

7
sources/qetgraphicsitem/element.cpp
View File

@ -225,14 +225,7 @@ void Element::paint(
QBrush brush; QBrush brush;
painter->setPen(pen); painter->setPen(pen);
painter->setBrush(brush); painter->setBrush(brush);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
if (options && options -> levelOfDetail < 1.0)
#else
#if TODO_LIST
#pragma message("@TODO remove code for QT 6 or later")
#endif
if (options && options->levelOfDetailFromTransform(painter->worldTransform()) < 1.0) if (options && options->levelOfDetailFromTransform(painter->worldTransform()) < 1.0)
#endif
{ {
painter->drawPicture(0, 0, m_low_zoom_picture); painter->drawPicture(0, 0, m_low_zoom_picture);
} else { } else {