Commit 35a21fdd authored by Patrick José Pereira's avatar Patrick José Pereira

QGroundControlQmlGlobal: Remove deprecated intersect function

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent f42faf1a
...@@ -221,7 +221,13 @@ bool QGroundControlQmlGlobal::linesIntersect(QPointF line1A, QPointF line1B, QPo ...@@ -221,7 +221,13 @@ bool QGroundControlQmlGlobal::linesIntersect(QPointF line1A, QPointF line1B, QPo
{ {
QPointF intersectPoint; QPointF intersectPoint;
return QLineF(line1A, line1B).intersect(QLineF(line2A, line2B), &intersectPoint) == QLineF::BoundedIntersection && #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
auto intersect = QLineF(line1A, line1B).intersect(QLineF(line2A, line2B), &intersectPoint);
#else
auto intersect = QLineF(line1A, line1B).intersects(QLineF(line2A, line2B), &intersectPoint);
#endif
return intersect == QLineF::BoundedIntersection &&
intersectPoint != line1A && intersectPoint != line1B; intersectPoint != line1A && intersectPoint != line1B;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment