diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 14:40:09 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 14:40:09 +0100 |
| commit | f04bf5d3cc59ff859d5135fdb5048245ae99b91d (patch) | |
| tree | 45058972aa8c1f2736270d03bdb9d973fb5e7050 /tests/auto/shared.h | |
| parent | 3bc71587c924d849b5d5780ff7b4c6e02b390f99 (diff) | |
| parent | 1e142242fc462ebfa5c84339c8f2de2273712ece (diff) | |
Merge 1.11 into master
Change-Id: I9603ade37a1f839019c9219c940dcbb95c1cac89
Diffstat (limited to 'tests/auto/shared.h')
| -rw-r--r-- | tests/auto/shared.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/shared.h b/tests/auto/shared.h index f16ca4bde..b7a3e2b11 100644 --- a/tests/auto/shared.h +++ b/tests/auto/shared.h @@ -183,9 +183,11 @@ inline QString objectFileName(const QString &baseName, const QString &profileNam { const SettingsPtr s = settings(); qbs::Profile profile(profileName, s.get()); - const auto tc = profile.value("qbs.toolchain").toStringList(); - const QString suffix = tc.contains("msvc") - || (tc.isEmpty() && qbs::Internal::HostOsInfo::isWindowsHost()) ? "obj" : "o"; + const auto tc = profile.value("qbs.toolchainType").toString(); + const auto tcList = profile.value("qbs.toolchain").toStringList(); + const bool isMsvc = tc == "msvc" || tcList.contains("msvc") + || (tc.isEmpty() && tcList.isEmpty() && qbs::Internal::HostOsInfo::isWindowsHost()); + const QString suffix = isMsvc ? "obj" : "o"; return baseName + '.' + suffix; } |