diff options
Diffstat (limited to 'tests/auto/widgets')
5 files changed, 13 insertions, 13 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; diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index fd4ce89b56..fd1751c5e7 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -52,7 +52,7 @@ using namespace QTestPrivate; // ItemRole has enumerators for numerical values 0..2, thus the only // valid numerical values for storing into an ItemRole variable are 0..3: -Q_CONSTEXPR QFormLayout::ItemRole invalidRole = QFormLayout::ItemRole(3); +constexpr QFormLayout::ItemRole invalidRole = QFormLayout::ItemRole(3); struct QFormLayoutTakeRowResultHolder { QFormLayoutTakeRowResultHolder(QFormLayout::TakeRowResult result) noexcept diff --git a/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp b/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp index 89bb946be9..d307d9f9a8 100644 --- a/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp +++ b/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp @@ -111,20 +111,20 @@ void tst_QSizePolicy::constExpr() /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54922 */ #if !defined(Q_CC_GNU) || defined(Q_CC_INTEL) || defined(Q_CC_CLANG) || Q_CC_GNU >= 408 // check that certain ctors are constexpr (compile-only): - { Q_CONSTEXPR QSizePolicy sp; Q_UNUSED(sp); } - { Q_CONSTEXPR QSizePolicy sp = QSizePolicy(); Q_UNUSED(sp); } - { Q_CONSTEXPR QSizePolicy sp = QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); Q_UNUSED(sp); } - { Q_CONSTEXPR QSizePolicy sp = QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding, QSizePolicy::DefaultType); - Q_CONSTEXPR QSizePolicy tp = sp.transposed(); Q_UNUSED(tp); } + { constexpr QSizePolicy sp; Q_UNUSED(sp); } + { constexpr QSizePolicy sp = QSizePolicy(); Q_UNUSED(sp); } + { constexpr QSizePolicy sp = QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); Q_UNUSED(sp); } + { constexpr QSizePolicy sp = QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding, QSizePolicy::DefaultType); + constexpr QSizePolicy tp = sp.transposed(); Q_UNUSED(tp); } { // QTBUG-69983: For ControlType != QSizePolicy::DefaultType, qCountTrailingZeroBits() // is used, which MSVC 15.8.1 does not consider constexpr due to built-ins # if defined(QT_HAS_CONSTEXPR_BUILTINS) && (!defined(Q_CC_MSVC) || _MSC_VER < 1915) - Q_RELAXED_CONSTEXPR auto sp = QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed, QSizePolicy::CheckBox); + constexpr auto sp = QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed, QSizePolicy::CheckBox); # else - Q_CONSTEXPR auto sp = QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding, QSizePolicy::DefaultType); + constexpr auto sp = QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding, QSizePolicy::DefaultType); # endif - Q_RELAXED_CONSTEXPR auto tp = sp.transposed(); Q_UNUSED(tp); + constexpr auto tp = sp.transposed(); Q_UNUSED(tp); } #else QSKIP("QSizePolicy cannot be constexpr with this version of the compiler."); |