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

Be less picky about "qmake --version" output.

Browse Source 
Older qmake versions have different output, don't be case sensitive.
Problems were reported with Qt Embedded 4.1.4.
This commit is contained in:
con
2009-04-24 10:20:23 +02:00
parent dfd2c5dbc3
commit 5c9778e7ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/qtversionmanager.cpp
View File

@@ -268,10 +268,10 @@ QString QtVersionManager::qtVersionForQMake(const QString &qmakePath)
if (!qmake.waitForFinished()) if (!qmake.waitForFinished())
return false; return false;
QString output = qmake.readAllStandardOutput(); QString output = qmake.readAllStandardOutput();
QRegExp regexp("(QMake version|Qmake version:)[\\s]*([\\d.]*)"); QRegExp regexp("(QMake version|QMake version:)[\\s]*([\\d.]*)", Qt::CaseInsensitive);
regexp.indexIn(output); regexp.indexIn(output);
if (regexp.cap(2).startsWith("2.")) { if (regexp.cap(2).startsWith("2.")) {
QRegExp regexp2("Using Qt version[\\s]*([\\d\\.]*)"); QRegExp regexp2("Using Qt version[\\s]*([\\d\\.]*)", Qt::CaseInsensitive);
regexp2.indexIn(output); regexp2.indexIn(output);
return regexp2.cap(1); return regexp2.cap(1);
} }