From 8da07f2a168464b626e0010dcd09cd181fa64665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=85=89?= Date: Wed, 7 Oct 2020 07:07:05 +0800 Subject: [PATCH] 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 --- src/QmlControls/QGroundControlQmlGlobal.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/src/QmlControls/QGroundControlQmlGlobal.cc index 8970a23e4..0916b3454 100644 --- a/src/QmlControls/QGroundControlQmlGlobal.cc +++ b/src/QmlControls/QGroundControlQmlGlobal.cc @@ -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); -- 2.22.0