summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-02-07 11:37:35 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-11 09:30:23 (GMT)
commit51f77e9e8eafa17de68153220685bf4961072aa3 (patch)
tree8580ff828ea238d707202b33fb53556ae384c4a4
parent781a9cf3d77f2a594e779186d3293c63385f1e4b (diff)
downloadQt-51f77e9e8eafa17de68153220685bf4961072aa3.zip
Qt-51f77e9e8eafa17de68153220685bf4961072aa3.tar.gz
Qt-51f77e9e8eafa17de68153220685bf4961072aa3.tar.bz2
Fix detection of mingw gcc >=4.6
Make sure that the version check works for gcc e.g. from mingw-builds, which contains spaces in the version info, e.g. g++ (i686-posix-dwarf, Built by MinGW-W64 project) 4.8.2 In Qt 5, support for MinGW-gcc versions older than 4.6 was dropped. Change-Id: Idac5fb3a8cd01200558032ea1bd997e30f0e8b8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--tools/configure/environment.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 7331e03..0c9c500 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -260,7 +260,7 @@ bool Environment::detectExecutable(const QString &executable)
int Environment::detectGPlusPlusVersion(const QString &executable,
bool *is64bit)
{
- QRegExp regexp(QLatin1String("[gG]\\+\\+[\\.exEX]{0,4} ([^\\s]+) (\\d+)\\.(\\d+)\\.(\\d+)"));
+ QRegExp regexp(QLatin1String("[gG]\\+\\+[\\.exEX]{0,4} ([^\\n]+) (\\d+)\\.(\\d+)\\.(\\d+)"));
QString stdOut = readProcessStandardOutput(executable + QLatin1String(" --version"));
if (regexp.indexIn(stdOut) != -1) {
const QString compiler = regexp.cap(1);