Browse Source

QGroundControlQmlGlobal: Remove deprecated intersect function

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 5 years ago
parent
commit
35a21fdd1f
  1. 8
      src/QmlControls/QGroundControlQmlGlobal.cc

8
src/QmlControls/QGroundControlQmlGlobal.cc

@ -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;
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;
}

Loading…
Cancel
Save