From 6f0df02d002356625f10683ef84da7685d92a2c4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 12 Aug 2020 14:14:02 +0200 Subject: Replace Qt CONSTEXPR defines with constexpr Both normal and relaxed constexpr are required by our new minimum of C++17. Change-Id: Ic028b88a2e7a6cb7d5925f3133b9d54859a81744 Reviewed-by: Sona Kurazyan --- tests/auto/corelib/global/qflags/tst_qflags.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/corelib/global/qflags/tst_qflags.cpp') diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp index 56319f215d..e0cc1d71f5 100644 --- a/tests/auto/corelib/global/qflags/tst_qflags.cpp +++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp @@ -93,7 +93,7 @@ void tst_QFlags::testFlagMultiBits() const template bool verifyConstExpr(T n) { return n == N; } -Q_DECL_RELAXED_CONSTEXPR Qt::MouseButtons testRelaxedConstExpr() +constexpr Qt::MouseButtons testRelaxedConstExpr() { Qt::MouseButtons value; value = Qt::LeftButton | Qt::RightButton; -- cgit v1.2.3