diff options
Diffstat (limited to 'tests/auto/widgets/graphicsview')
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp index da3270d527..d23ccedc6f 100644 --- a/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp @@ -116,7 +116,7 @@ void tst_QGraphicsTransform::scale() // fuzzyCompareNonZero is a very slightly looser version of qFuzzyCompare // for use with values that are not very close to zero -Q_DECL_CONSTEXPR static inline bool fuzzyCompareNonZero(float p1, float p2) +constexpr static inline bool fuzzyCompareNonZero(float p1, float p2) { return (qAbs(p1 - p2) <= 0.00003f * qMin(qAbs(p1), qAbs(p2))); } diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.h b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.h index ed16878ecb..42e9e6e2a3 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.h +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.h @@ -34,7 +34,7 @@ // value to add/remove has to be obtained in test run using the actual style. struct ExpectedValueDescription { - Q_DECL_CONSTEXPR ExpectedValueDescription(int v = 0, int sbeta = 0, int sta = 0) + constexpr ExpectedValueDescription(int v = 0, int sbeta = 0, int sta = 0) : value(v) , scrollBarExtentsToAdd(sbeta) , spacingsToAdd(sta) @@ -55,7 +55,7 @@ struct ExpectedValueDescription { // Describes how often the scroll bar width/height has to be added to/removed // from the according side of the sceneRect. struct ScrollBarCount { - Q_DECL_CONSTEXPR ScrollBarCount(int l = 0, int t = 0, int r = 0, int b = 0 ) + constexpr ScrollBarCount(int l = 0, int t = 0, int r = 0, int b = 0 ) : left(l) , top(t) , right(r) diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp index 297e83421b..5c9134a3b0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp @@ -49,7 +49,7 @@ static void _scrollBarRanges_addTestData(const QByteArray &style, bool styled) const int viewWidth = 250; const int viewHeight = 100; - static Q_CONSTEXPR struct Data { + static constexpr struct Data { const char *name; QRectF sceneRect; ScrollBarCount sceneRectOffsetFactors; |