Unverified Commit 8da07f2a authored by 小光's avatar 小光 Committed by GitHub

Enable QLineF::intersects on Qt version 5.14.0 (#9095)

function "QLineF::IntersectionType QLineF::intersects(const QLineF &line, QPointF *intersectionPoint) const" was introduced in Qt 5.14, and QLineF::intersect is obsolete.

see also:
https://doc.qt.io/qt-5.14/qlinef-obsolete.html
https://doc.qt.io/qt-5.14/qlinef.html#intersects
parent e7e4d847
......@@ -218,7 +218,7 @@ bool QGroundControlQmlGlobal::linesIntersect(QPointF line1A, QPointF line1B, QPo
{
QPointF intersectPoint;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
auto intersect = QLineF(line1A, line1B).intersect(QLineF(line2A, line2B), &intersectPoint);
#else
auto intersect = QLineF(line1A, line1B).intersects(QLineF(line2A, line2B), &intersectPoint);
......
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