diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-14 14:51:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-14 12:54:42 +0000 |
| commit | 6144279d346670130e0ecdfaf789beaa44cd6755 (patch) | |
| tree | 1677ec624356c37ea17d08f5e5bae7f7a6fb4ca5 /share | |
| parent | 5923eacf0a3af0740f7b55cdedd3fda083f8b03e (diff) | |
Fix MSVC environment
Return the right environment from the MsvcProbe.
This amends commit d0404591.
Change-Id: Iaedb862a07cd9f0c2966ed21714ee7df30927d17
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/MsvcProbe.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs index 1ee2b8159..700c579f5 100644 --- a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs +++ b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs @@ -77,7 +77,7 @@ PathProbe { versionMinor = parseInt(ver.substr(2, 2), 10); versionPatch = parseInt(ver.substr(4), 10); - buildEnv = info.buildEnvironment; + buildEnv = info.buildEnvironment || infoCpp.buildEnvironment; var clParentDir = FileInfo.joinPaths(FileInfo.path(compilerFilePath), ".."); var inclPath = FileInfo.joinPaths(clParentDir, "INCLUDE"); if (!File.exists(inclPath)) |