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 --- src/corelib/text/qstringbuilder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/text/qstringbuilder.h') diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h index 512b7e7bf7..da4277f9a8 100644 --- a/src/corelib/text/qstringbuilder.h +++ b/src/corelib/text/qstringbuilder.h @@ -193,7 +193,7 @@ template <> struct QConcatenable : private QAbstractConcatenable typedef char16_t type; typedef QString ConvertTo; enum { ExactSize = true }; - static Q_DECL_CONSTEXPR int size(char16_t) { return 1; } + static constexpr int size(char16_t) { return 1; } static inline void appendTo(char16_t c, QChar *&out) { *out++ = c; } }; -- cgit v1.2.3