This code doesn't work without constexpr.

--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2018-09-27 20:25:37 +03:00
parent 33554c03b5
commit fadc55983d
2 changed files with 2 additions and 2 deletions

View File

@ -463,7 +463,7 @@ static inline bool VFuzzyComparePossibleNulls(double p1, double p2)
} }
} }
Q_DECL_CONSTEXPR qreal accuracyPointOnLine = (0.12/*mm*/ / 25.4) * PrintDPI; constexpr qreal accuracyPointOnLine = (0.12/*mm*/ / 25.4) * PrintDPI;
Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2); Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2);
Q_DECL_CONSTEXPR static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2) Q_DECL_CONSTEXPR static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2)

View File

@ -32,7 +32,7 @@
#include "backport/qoverload.h" #include "backport/qoverload.h"
Q_DECL_CONSTEXPR qreal PrintDPI = 96.0; constexpr qreal PrintDPI = 96.0;
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
// this adds const to non-const objects (like std::as_const) // this adds const to non-const objects (like std::as_const)