Skip to content

Commit a4c655f

Browse files
committed
misc fix regarding the use of a deprecated function (take two)
1 parent 8ad0ec2 commit a4c655f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/core/filters/page_split/PageLayout.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ void PageLayout::ensureSameDirection(const QLineF& line1, QLineF& line2) {
351351
*/
352352
void PageLayout::maybeAddIntersectionPoint(QPolygonF& poly, const QLineF& line1, const QLineF& line2) {
353353
QPointF intersection;
354-
#if QT_VERSION_MAJOR == 5
354+
#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
355355
auto is = line1.intersect(line2, &intersection);
356356
#else
357357
auto is = line1.intersects(line2, &intersection);

src/foundation/Proximity.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Proximity Proximity::pointAndLineSegment(const QPointF& pt, const QLineF& segmen
2828
perpendicular.translate(pt);
2929
// Calculate intersection.
3030
QPointF intersection;
31-
#if QT_VERSION_MAJOR == 5
31+
#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
3232
segment.intersect(perpendicular, &intersection);
3333
#else
3434
segment.intersects(perpendicular, &intersection);

0 commit comments

Comments
 (0)