diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2016-10-05 16:34:38 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-14 14:27:12 +0000 |
| commit | 6851cf52afe188e94344ce22074af97e054f5896 (patch) | |
| tree | 7b73b466f95cd38ecb14c8ab536d8df6a00df00e /tools/configure | |
| parent | 3189313f226f550892a8bd4993ed52b44abea13a (diff) | |
Match MSVC version strings in other languages than English
5971b88ecd08a81720c3556029cecd35b0cf2cb5 introduced a regular expression
to parse the Visual C++ compiler version that failed to match non-English
output (e.g. German), which is produced by default on many systems.
Task-number: QTBUG-56388
Change-Id: Id0408ce31e827e7aa087d8e3dd83024cf09dac23
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/environment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 562c5db7a7..60616f35e7 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -182,7 +182,7 @@ QString Environment::msvcVersion() cout << "Could not get cl version" << returnValue << qPrintable(version) << '\n';; version.clear(); } else { - QRegExp versionRegexp(QStringLiteral("^.*Compiler Version ([0-9.]+) for.*$")); + QRegExp versionRegexp(QStringLiteral("^.*\\b(\\d{2,2}\\.\\d{2,2}\\.\\d{5,5})\\b.*$")); Q_ASSERT(versionRegexp.isValid()); if (versionRegexp.exactMatch(version)) { version = versionRegexp.cap(1); |