1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLogging: make QRegularExpression objects static const

Browse Source 
To avoid recompiling them multiple times.

Change-Id: Ie4766be3bbaa536bf22b0eaacc430055fe4651cd
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2018-07-20 21:55:48 +02:00
parent 4b7cb3bc91
commit 1a4a2f7f58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qlogging.cpp
View File

@ -1211,8 +1211,8 @@ void QMessagePattern::setPattern(const QString &pattern)
tokens[i] = backtraceTokenC; tokens[i] = backtraceTokenC;
QString backtraceSeparator = QStringLiteral("|"); QString backtraceSeparator = QStringLiteral("|");
int backtraceDepth = 5; int backtraceDepth = 5;
QRegularExpression depthRx(QStringLiteral(" depth=(?|\"([^\"]*)\"|([^ }]*))")); static const QRegularExpression depthRx(QStringLiteral(" depth=(?|\"([^\"]*)\"|([^ }]*))"));
QRegularExpression separatorRx(QStringLiteral(" separator=(?|\"([^\"]*)\"|([^ }]*))")); static const QRegularExpression separatorRx(QStringLiteral(" separator=(?|\"([^\"]*)\"|([^ }]*))"));
QRegularExpressionMatch m = depthRx.match(lexeme); QRegularExpressionMatch m = depthRx.match(lexeme);
if (m.hasMatch()) { if (m.hasMatch()) {
int depth = m.capturedRef(1).toInt(); int depth = m.capturedRef(1).toInt();
@ -1298,7 +1298,7 @@ static QStringList backtraceFramesForLogMessage(int frameCount)
// The offset and function name are optional. // The offset and function name are optional.
// This regexp tries to extract the library name (without the path) and the function name. // This regexp tries to extract the library name (without the path) and the function name.
// This code is protected by QMessagePattern::mutex so it is thread safe on all compilers // This code is protected by QMessagePattern::mutex so it is thread safe on all compilers
static QRegularExpression rx(QStringLiteral("^(?:[^(]*/)?([^(/]+)\\(([^+]*)(?:[\\+[a-f0-9x]*)?\\) \\[[a-f0-9x]*\\]$")); static const QRegularExpression rx(QStringLiteral("^(?:[^(]*/)?([^(/]+)\\(([^+]*)(?:[\\+[a-f0-9x]*)?\\) \\[[a-f0-9x]*\\]$"));
QVarLengthArray<void*, 32> buffer(8 + frameCount); QVarLengthArray<void*, 32> buffer(8 + frameCount);
int n = backtrace(buffer.data(), buffer.size()); int n = backtrace(buffer.data(), buffer.size());