From 0f013d3c02fd662e77c62d9ef9272b5ed04e3772 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 11 Oct 2021 15:36:53 +0200 Subject: Fix compilation error with MSVC 2019 and C++20 Fixes: QTBUG-97425 Change-Id: Id327e3494d1deae852f953211c0409a80beafe88 Reviewed-by: Giuseppe D'Angelo (cherry picked from commit 64e931246484eb36b2b921cdec38263b21167523) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qregularexpression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp index e055ae064a..36d537cb0b 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -1178,7 +1178,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(); -- cgit v1.2.3