diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-12 15:40:51 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-13 09:01:06 +0000 |
| commit | b907fb1fef8ba704dde383c2d9bb2065cddca515 (patch) | |
| tree | 38ec49c6d0e2589860d68b3a45577ca62c46b541 /src/app | |
| parent | 6fcbc1a996d1726d7df5e078663a095b235d5b00 (diff) | |
setup-qt: Fix detection for 32-bit MSVC
The installer directory names do not contain the architecture in that
case.
Change-Id: I072df4260eefff7dd15d90770c73e1187e7f72cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index d4a59e30b..c22700a95 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -134,7 +134,7 @@ static QStringList qbsToolchainFromDirName(const QString &dir) static Version msvcVersionFromDirName(const QString &dir) { - static const std::regex regexp("^msvc(\\d\\d\\d\\d)_.*$"); + static const std::regex regexp("^msvc(\\d\\d\\d\\d).*$"); std::smatch match; const std::string dirString = dir.toStdString(); if (!std::regex_match(dirString, match, regexp)) @@ -183,6 +183,8 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) env.qbsToolchain = qbsToolchainFromDirName(qtDir.dirName()); env.msvcVersion = msvcVersionFromDirName(qtDir.dirName()); env.architecture = archFromDirName(qtDir.dirName()); + if (env.msvcVersion.isValid() && env.architecture.isEmpty()) + env.architecture = QLatin1String("x86"); env.targetPlatform = platformFromDirName(qtDir.dirName()); qtDir.cdUp(); env.qtVersion = Version::fromString(qtDir.dirName()); |