From 488fbb6baaa42afdf55c71a759496f2ba095d9b4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 30 Aug 2022 17:18:16 +0300 Subject: [PATCH] Fix support Visual Studio 2015. --- src/libs/vgeometry/vabstractcurve.cpp | 2 +- src/libs/vgeometry/vabstractcurve.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libs/vgeometry/vabstractcurve.cpp b/src/libs/vgeometry/vabstractcurve.cpp index efcb36a24..e6fa69f90 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(Q_CC_MSVC) && _MSC_VER <= 1900 const qreal VAbstractCurve::minLength = ToPixel(1, Unit::Mm); #endif diff --git a/src/libs/vgeometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h index d8490fdc3..e87b1d847 100644 --- a/src/libs/vgeometry/vabstractcurve.h +++ b/src/libs/vgeometry/vabstractcurve.h @@ -112,8 +112,12 @@ public: void SetAliasSuffix(const QString &aliasSuffix) override; -#if defined(Q_CC_MSVC) && _MSC_VER > 1900 +#if defined(Q_CC_MSVC) +#if _MSC_VER > 1900 + static constexpr qreal minLength = ToPixel(1, Unit::Mm); +#else static const qreal minLength; +#endif #else static constexpr qreal minLength = ToPixel(1, Unit::Mm); #endif