diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-12 14:14:02 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-14 15:52:58 +0200 |
| commit | 6f0df02d002356625f10683ef84da7685d92a2c4 (patch) | |
| tree | 46713209af459ebda534c3404f48c5f5c80ba3f8 /tests/auto/corelib/text/qstring | |
| parent | 44cce1a2ea9dadd8b2de93f40de34269dda703c0 (diff) | |
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>
Diffstat (limited to 'tests/auto/corelib/text/qstring')
| -rw-r--r-- | tests/auto/corelib/text/qstring/tst_qstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index 321e9ba32e..b26381c387 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -265,8 +265,8 @@ class CharStarContainer { const char *str; public: - explicit Q_DECL_CONSTEXPR CharStarContainer(const char *s = nullptr) : str(s) {} - Q_DECL_CONSTEXPR operator const char *() const { return str; } + explicit constexpr CharStarContainer(const char *s = nullptr) : str(s) {} + constexpr operator const char *() const { return str; } }; } // unnamed namespace |