diff --git a/src/libs/vgeometry/vabstractcurve.cpp b/src/libs/vgeometry/vabstractcurve.cpp
index e6fa69f90..e292b173d 100644
--- a/src/libs/vgeometry/vabstractcurve.cpp
+++ b/src/libs/vgeometry/vabstractcurve.cpp
@@ -40,7 +40,7 @@
 #include "../vmisc/compatibility.h"
 #include "../ifc/exception/vexceptionobjecterror.h"
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1900
+#if defined(__cpp_constexpr) && __cpp_constexpr-0 < 201304
 const qreal VAbstractCurve::minLength = ToPixel(1, Unit::Mm);
 #endif
 
diff --git a/src/libs/vgeometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h
index e87b1d847..b4f9949b0 100644
--- a/src/libs/vgeometry/vabstractcurve.h
+++ b/src/libs/vgeometry/vabstractcurve.h
@@ -112,15 +112,12 @@ public:
 
     void SetAliasSuffix(const QString &aliasSuffix) override;
 
-#if defined(Q_CC_MSVC)
-#if _MSC_VER > 1900
+#if defined(__cpp_constexpr) && __cpp_constexpr-0 >= 201304
     static constexpr qreal minLength = ToPixel(1, Unit::Mm);
 #else
     static const qreal minLength;
 #endif
-#else
-    static constexpr qreal minLength = ToPixel(1, Unit::Mm);
-#endif
+
 protected:
     virtual void CreateName() =0;
     virtual void CreateAlias() =0;
diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp
index bf9330fe8..0ca6a3696 100644
--- a/src/libs/vgeometry/vellipticalarc.cpp
+++ b/src/libs/vgeometry/vellipticalarc.cpp
@@ -477,7 +477,7 @@ auto VEllipticalArc::GetPoints() const -> QVector<QPointF>
     const QPointF center = VAbstractArc::GetCenter().toQPointF();
 
     // Don't work with 0 radius. Always make it bigger than 0.
-    constexpr qreal threshold = ToPixel(0.001, Unit::Mm);
+    Q_RELAXED_CONSTEXPR qreal threshold = ToPixel(0.001, Unit::Mm);
     qreal radius1 = qMax(d->radius1, threshold);
     qreal radius2 = qMax(d->radius2, threshold);
     qreal max = qMax(d->radius1, d->radius2);