summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2021-10-11 15:36:53 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-10-12 00:28:12 +0000
commit7fcae4e1b51d8a9d1ba65fb1ade240ae8b204980 (patch)
tree66a99f0dec099f3a3c1fe28187caac2f94c1c7e6
parent5c5f6b453d35f2d10e1448ba5302fe1c705f2c35 (diff)
Fix compilation error with MSVC 2019 and C++20
Fixes: QTBUG-97425 Change-Id: Id327e3494d1deae852f953211c0409a80beafe88 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit 64e931246484eb36b2b921cdec38263b21167523) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/corelib/text/qregularexpression.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index 52134e3240..b0728bca4a 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -1184,7 +1184,7 @@ void QRegularExpressionPrivate::doMatch(QRegularExpressionMatchPrivate *priv,
// its length is zero. We however allow it in input: a QStringView
// subject may have data == nullptr. In this case, to keep PCRE
// happy, pass a pointer to a dummy character.
- constexpr char16_t dummySubject = 0;
+ const char16_t dummySubject = 0;
const char16_t * const subjectUtf16 = [&]()
{
const auto subjectUtf16 = priv->subject.utf16();