feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DebugHelpers: Use static QRegExp for performance reasons

Browse Source 
Reviewed-by: Bill King
This commit is contained in:
Kai Koehne
2010-11-08 09:41:40 +01:00
parent 424fcf8c04
commit 00a9766408
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/buildablehelperlibrary.cpp
View File

@@ -90,10 +90,12 @@ QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath)
return QString(); return QString();
} }
const QString output = QString::fromLocal8Bit(qmake.readAllStandardOutput()); const QString output = QString::fromLocal8Bit(qmake.readAllStandardOutput());
QRegExp regexp(QLatin1String("(QMake version|QMake version:)[\\s]*([\\d.]*)"), Qt::CaseInsensitive); static QRegExp regexp(QLatin1String("(QMake version|QMake version:)[\\s]*([\\d.]*)"),
Qt::CaseInsensitive);
regexp.indexIn(output); regexp.indexIn(output);
if (regexp.cap(2).startsWith(QLatin1String("2."))) { if (regexp.cap(2).startsWith(QLatin1String("2."))) {
QRegExp regexp2(QLatin1String("Using Qt version[\\s]*([\\d\\.]*)"), Qt::CaseInsensitive); static QRegExp regexp2(QLatin1String("Using Qt version[\\s]*([\\d\\.]*)"),
Qt::CaseInsensitive);
regexp2.indexIn(output); regexp2.indexIn(output);
const QString version = regexp2.cap(1); const QString version = regexp2.cap(1);
return version; return version;
@@ -108,7 +110,7 @@ bool BuildableHelperLibrary::checkMinimumQtVersion(const QString &qtVersionStrin
int patch = -1; int patch = -1;
// check format // check format
QRegExp qtVersionRegex(QLatin1String("^\\d+\\.\\d+\\.\\d+$")); static QRegExp qtVersionRegex(QLatin1String("^\\d+\\.\\d+\\.\\d+$"));
if (!qtVersionRegex.exactMatch(qtVersionString)) if (!qtVersionRegex.exactMatch(qtVersionString))
return false; return false;