diff options
| -rw-r--r-- | src/corelib/text/qregularexpression.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qopenglpaintdevice.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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(); diff --git a/src/opengl/qopenglpaintdevice.cpp b/src/opengl/qopenglpaintdevice.cpp index 811425cf69..158dacf241 100644 --- a/src/opengl/qopenglpaintdevice.cpp +++ b/src/opengl/qopenglpaintdevice.cpp @@ -331,7 +331,7 @@ void QOpenGLPaintDevice::setDotsPerMeterX(qreal dpmx) void QOpenGLPaintDevice::setDotsPerMeterY(qreal dpmy) { - d_ptr->dpmx = dpmy; + d_ptr->dpmy = dpmy; } /*! |