This code doesn't work without constexpr.
--HG-- branch : release
This commit is contained in:
parent
33554c03b5
commit
fadc55983d
|
@ -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_DECL_CONSTEXPR static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2)
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#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)
|
||||
// this adds const to non-const objects (like std::as_const)
|
||||
|
|
Loading…
Reference in New Issue
Block a user