From 5c9778e7ad8f4a68c13d19f1e1f4d9ce57cfd31e Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 24 Apr 2009 10:20:23 +0200
Subject: [PATCH] Be less picky about "qmake --version" output.
Older qmake versions have different output, don't be case sensitive.
Problems were reported with Qt Embedded 4.1.4.
---
src/plugins/projectexplorer/qtversionmanager.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/projectexplorer/qtversionmanager.cpp b/src/plugins/projectexplorer/qtversionmanager.cpp
index dae9faddca4..05d2770c35e 100644
--- a/src/plugins/projectexplorer/qtversionmanager.cpp
+++ b/src/plugins/projectexplorer/qtversionmanager.cpp
@@ -268,10 +268,10 @@ QString QtVersionManager::qtVersionForQMake(const QString &qmakePath)
if (!qmake.waitForFinished())
return false;
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);
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);
return regexp2.cap(1);
}
--
GitLab