aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with Qt 5.6.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-01-29 16:06:01 +02:00
parent fb001c23a5
commit c3cbfbaaca
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/vgeometry/vplacelabelitem.cpp
View File

@ -364,7 +364,7 @@ PlaceLabelImg VPlaceLabelItem::LabelShape() const
QPolygonF shape3(arc.GetPoints()); QPolygonF shape3(arc.GetPoints());
if (not shape3.isClosed() && not shape3.isEmpty()) if (not shape3.isClosed() && not shape3.isEmpty())
{ {
shape3 << ConstFirst(shape3); shape3 << ConstFirst<QPointF>(shape3);
} }
return PlaceLabelImg({t.map(shape1), t.map(shape2), t.map(shape3)}); return PlaceLabelImg({t.map(shape1), t.map(shape2), t.map(shape3)});
@ -378,7 +378,7 @@ PlaceLabelImg VPlaceLabelItem::LabelShape() const
QPolygonF circle(arc.GetPoints()); QPolygonF circle(arc.GetPoints());
if (not circle.isClosed() && not circle.isEmpty()) if (not circle.isClosed() && not circle.isEmpty())
{ {
circle << ConstFirst(circle); circle << ConstFirst<QPointF>(circle);
} }
return PlaceLabelImg({t.map(circle)}); return PlaceLabelImg({t.map(circle)});
@ -424,11 +424,11 @@ QPainterPath VPlaceLabelItem::LabelShapePath() const
QPainterPath VPlaceLabelItem::LabelShapePath(const PlaceLabelImg &shape) QPainterPath VPlaceLabelItem::LabelShapePath(const PlaceLabelImg &shape)
{ {
QPainterPath path; QPainterPath path;
for (auto &p : shape) for (const auto &p : shape)
{ {
if (not p.isEmpty()) if (not p.isEmpty())
{ {
path.moveTo(ConstFirst(p)); path.moveTo(ConstFirst<QPointF>(p));
path.addPolygon(p); path.addPolygon(p);
} }
} }