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 <sona.kurazyan@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 8b78b34992..52464ffc15 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -1149,7 +1149,7 @@ void tst_QArrayData::literals()
 
     struct LiteralType {
         int value;
-        Q_DECL_CONSTEXPR LiteralType(int v = 0) : value(v) {}
+        constexpr LiteralType(int v = 0) : value(v) {}
     };
 
     {
@@ -1226,17 +1226,17 @@ struct CompilerHasCxx11ImplicitMoves
 
     struct DetectConstructor
     {
-        Q_DECL_CONSTEXPR DetectConstructor()
+        constexpr DetectConstructor()
             : constructor(DefaultConstructor)
         {
         }
 
-        Q_DECL_CONSTEXPR DetectConstructor(const DetectConstructor &)
+        constexpr DetectConstructor(const DetectConstructor &)
             : constructor(CopyConstructor)
         {
         }
 
-        Q_DECL_CONSTEXPR DetectConstructor(DetectConstructor &&)
+        constexpr DetectConstructor(DetectConstructor &&)
             : constructor(MoveConstructor)
         {
         }