diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 15:39:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-05 18:41:20 +0200 |
| commit | 412dd857b81471277e1014b6329f46a389a42cb3 (patch) | |
| tree | dd1c16b973f01be75b6184106e8a6e158b5286cf /src/corelib/text/qregularexpression.cpp | |
| parent | 52f3a7d9d40d3bf835bb0716ad201ee56731b980 (diff) | |
Compile QRegularExpression into qmake
This is required to be able to port qmake over to use
QRegularExpression instead of QRegExp.
Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/text/qregularexpression.cpp')
| -rw-r--r-- | src/corelib/text/qregularexpression.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp index 7ed8618e96..6b81f5cc79 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -1535,9 +1535,17 @@ QString QRegularExpression::errorString() const } while (errorStringLength < 0); errorString.resize(errorStringLength); +#ifdef QT_NO_TRANSLATION + return errorString; +#else return QCoreApplication::translate("QRegularExpression", std::move(errorString).toLatin1().constData()); +#endif } +#ifdef QT_NO_TRANSLATION + return QLatin1String("no error"); +#else return QCoreApplication::translate("QRegularExpression", "no error"); +#endif } /*! |